kelvin/wms-dj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: kelvin:0e2cd55fbd4742991e03e01f44942e13cea58695
Branches Tags
kelvin:master
kelvin:1.2.0_241127_beta
..
compare: kelvin:a425fd5ea4ff9651203c6d5b9351a3462de74f56
Branches Tags
kelvin:master
kelvin:1.2.0_241127_beta

No commits in common. "0e2cd55fbd4742991e03e01f44942e13cea58695" and "a425fd5ea4ff9651203c6d5b9351a3462de74f56" have entirely different histories.
0e2cd55fbd ... a425fd5ea4

3 changed files with 75 additions and 103 deletions
Show Stats Expand all files Collapse all files

34
ktg-admin/src/main/java/com/ktg/web/controller/system/SysMessageController.java
View File

@ -7,7 +7,6 @@ import com.ktg.common.constant.UserConstants;
import com.ktg.common.core.domain.entity.SysUser; import com.ktg.common.core.domain.entity.SysUser;
import com.ktg.common.utils.StringUtils; import com.ktg.common.utils.StringUtils;
import com.ktg.framework.message.MessageProvider; import com.ktg.framework.message.MessageProvider;
import com.ktg.system.domain.dto.AgvArrivedDto;
import com.ktg.system.service.ISysUserService; import com.ktg.system.service.ISysUserService;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -36,7 +35,8 @@ import com.ktg.common.core.page.TableDataInfo;
*/ */
@RestController @RestController
@RequestMapping("/system/message") @RequestMapping("/system/message")
public class SysMessageController extends BaseController { public class SysMessageController extends BaseController
{
@Autowired @Autowired
private ISysMessageService sysMessageService; private ISysMessageService sysMessageService;
@Autowired @Autowired
@ -49,7 +49,8 @@ public class SysMessageController extends BaseController {
*/ */
@PreAuthorize("@ss.hasPermi('system:message:list')") @PreAuthorize("@ss.hasPermi('system:message:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysMessage sysMessage) { public TableDataInfo list(SysMessage sysMessage)
{
startPage(); startPage();
List<SysMessage> list = sysMessageService.selectSysMessageList(sysMessage); List<SysMessage> list = sysMessageService.selectSysMessageList(sysMessage);
return getDataTable(list); return getDataTable(list);
@ -61,7 +62,8 @@ public class SysMessageController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:message:export')") @PreAuthorize("@ss.hasPermi('system:message:export')")
@Log(title = "消息", businessType = BusinessType.EXPORT) @Log(title = "消息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, SysMessage sysMessage) { public void export(HttpServletResponse response, SysMessage sysMessage)
{
List<SysMessage> list = sysMessageService.selectSysMessageList(sysMessage); List<SysMessage> list = sysMessageService.selectSysMessageList(sysMessage);
ExcelUtil<SysMessage> util = new ExcelUtil<SysMessage>(SysMessage.class); ExcelUtil<SysMessage> util = new ExcelUtil<SysMessage>(SysMessage.class);
util.exportExcel(response, list, "消息数据"); util.exportExcel(response, list, "消息数据");
@ -72,7 +74,8 @@ public class SysMessageController extends BaseController {
*/ */
@PreAuthorize("@ss.hasPermi('system:message:query')") @PreAuthorize("@ss.hasPermi('system:message:query')")
@GetMapping(value = "/{messageId}") @GetMapping(value = "/{messageId}")
public AjaxResult getInfo(@PathVariable("messageId") Long messageId) { public AjaxResult getInfo(@PathVariable("messageId") Long messageId)
{
return AjaxResult.success(sysMessageService.selectSysMessageByMessageId(messageId)); return AjaxResult.success(sysMessageService.selectSysMessageByMessageId(messageId));
} }
@ -82,28 +85,20 @@ public class SysMessageController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:message:add')") @PreAuthorize("@ss.hasPermi('system:message:add')")
@Log(title = "消息", businessType = BusinessType.INSERT) @Log(title = "消息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody SysMessage sysMessage) { public AjaxResult add(@RequestBody SysMessage sysMessage)
{
messageProvider.sendMessage(sysMessage); messageProvider.sendMessage(sysMessage);
return AjaxResult.success(); return AjaxResult.success();
} }
/**
* 通知用户agv小车到达
*/
@Log(title = "消息", businessType = BusinessType.INSERT)
@PostMapping("/open/agv-arrived")
public AjaxResult addAgv(@RequestBody AgvArrivedDto agvArrivedDto) {
sysMessageService.insertSysPromptMessage("AGV小车已到达", "订单号: " + agvArrivedDto.getOrderNo());
return AjaxResult.success();
}
/** /**
* 修改消息 * 修改消息
*/ */
@PreAuthorize("@ss.hasPermi('system:message:edit')") @PreAuthorize("@ss.hasPermi('system:message:edit')")
@Log(title = "消息", businessType = BusinessType.UPDATE) @Log(title = "消息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody SysMessage sysMessage) { public AjaxResult edit(@RequestBody SysMessage sysMessage)
{
return toAjax(sysMessageService.updateSysMessage(sysMessage)); return toAjax(sysMessageService.updateSysMessage(sysMessage));
} }
@ -113,8 +108,9 @@ public class SysMessageController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:message:remove')") @PreAuthorize("@ss.hasPermi('system:message:remove')")
@Log(title = "消息", businessType = BusinessType.DELETE) @Log(title = "消息", businessType = BusinessType.DELETE)
@DeleteMapping("/{messageIds}") @DeleteMapping("/{messageIds}")
public AjaxResult remove(@PathVariable Long[] messageIds) { public AjaxResult remove(@PathVariable Long[] messageIds)
for (Long messageId : messageIds {
for (Long messageId: messageIds
) { ) {
SysMessage sysMessage = sysMessageService.selectSysMessageByMessageId(messageId); SysMessage sysMessage = sysMessageService.selectSysMessageByMessageId(messageId);
sysMessage.setDeletedFlag(UserConstants.YES); sysMessage.setDeletedFlag(UserConstants.YES);

13
ktg-system/src/main/java/com/ktg/system/domain/dto/AgvArrivedDto.java
View File

@ -1,13 +0,0 @@
package com.ktg.system.domain.dto;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
@Getter
@Setter
public class AgvArrivedDto {
@NotBlank(message = "订单号不能为空")
String orderNo;
}

65
ktg-system/src/main/resources/mapper/system/SysNoticeMapper.xml
View File

@ -1,34 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ktg.system.mapper.SysNoticeMapper"> <mapper namespace="com.ktg.system.mapper.SysNoticeMapper">
<resultMap type="SysNotice" id="SysNoticeResult"> <resultMap type="SysNotice" id="SysNoticeResult">
<result property="noticeId" column="notice_id"/> <result property="noticeId" column="notice_id" />
<result property="noticeTitle" column="notice_title"/> <result property="noticeTitle" column="notice_title" />
<result property="noticeType" column="notice_type"/> <result property="noticeType" column="notice_type" />
<result property="noticeContent" column="notice_content"/> <result property="noticeContent" column="notice_content" />
<result property="status" column="status"/> <result property="status" column="status" />
<result property="createBy" column="create_by"/> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time" />
<result property="updateBy" column="update_by"/> <result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time" />
<result property="remark" column="remark"/> <result property="remark" column="remark" />
</resultMap> </resultMap>
<sql id="selectNoticeVo"> <sql id="selectNoticeVo">
SELECT notice_id, select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark
notice_title, from sys_notice
notice_type,
notice_content
status,
create_by,
create_time,
update_by,
update_time,
remark
FROM sys_notice
</sql> </sql>
<select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult"> <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">
@ -53,18 +44,18 @@
<insert id="insertNotice" parameterType="SysNotice"> <insert id="insertNotice" parameterType="SysNotice">
insert into sys_notice ( insert into sys_notice (
<if test="noticeTitle != null and noticeTitle != '' ">notice_title,</if> <if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
<if test="noticeType != null and noticeType != '' ">notice_type,</if> <if test="noticeType != null and noticeType != '' ">notice_type, </if>
<if test="noticeContent != null and noticeContent != '' ">notice_content,</if> <if test="noticeContent != null and noticeContent != '' ">notice_content, </if>
<if test="status != null and status != '' ">status,</if> <if test="status != null and status != '' ">status, </if>
<if test="remark != null and remark != ''">remark,</if> <if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
create_time create_time
)values( )values(
<if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle},</if> <if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
<if test="noticeType != null and noticeType != ''">#{noticeType},</if> <if test="noticeType != null and noticeType != ''">#{noticeType}, </if>
<if test="noticeContent != null and noticeContent != ''">#{noticeContent},</if> <if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </if>
<if test="status != null and status != ''">#{status},</if> <if test="status != null and status != ''">#{status}, </if>
<if test="remark != null and remark != ''">#{remark},</if> <if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate() sysdate()
@ -74,10 +65,10 @@
<update id="updateNotice" parameterType="SysNotice"> <update id="updateNotice" parameterType="SysNotice">
update sys_notice update sys_notice
<set> <set>
<if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle},</if> <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
<if test="noticeType != null and noticeType != ''">notice_type = #{noticeType},</if> <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>
<if test="noticeContent != null">notice_content = #{noticeContent},</if> <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
<if test="status != null and status != ''">status = #{status},</if> <if test="status != null and status != ''">status = #{status}, </if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate() update_time = sysdate()
</set> </set>
@ -85,9 +76,7 @@
</update> </update>
<delete id="deleteNoticeById" parameterType="Long"> <delete id="deleteNoticeById" parameterType="Long">
delete delete from sys_notice where notice_id = #{noticeId}
from sys_notice
where notice_id = #{noticeId}
</delete> </delete>
<delete id="deleteNoticeByIds" parameterType="Long"> <delete id="deleteNoticeByIds" parameterType="Long">