From 6ab02e20ad7d03dace2445b49badfc8bc20cadb0 Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Wed, 15 May 2024 17:10:33 +0800 Subject: [PATCH] =?UTF-8?q?202404=20=E5=85=8D=E8=B4=A3=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ .../java/com/sv/barcode/ListenKeyFrame.java | 4 +-- oms/src/main/java/com/OmsApplication.java | 2 +- .../oms/controller/DisclaimersController.java | 6 ++-- other/sql/202404.sql | 6 ++++ .../java/com/sv/mapper/DisclaimersMapper.java | 6 +--- .../sv/service/oms/DisclaimersService.java | 1 + .../mybatis/mapper/sv/DisclaimersMapper.xml | 35 ++++--------------- 8 files changed, 23 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 96da241..e926073 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,6 @@ hs_err_pid* */target +target + *.iml diff --git a/netty-client/src/main/java/com/sv/barcode/ListenKeyFrame.java b/netty-client/src/main/java/com/sv/barcode/ListenKeyFrame.java index fcf928d..384b21f 100644 --- a/netty-client/src/main/java/com/sv/barcode/ListenKeyFrame.java +++ b/netty-client/src/main/java/com/sv/barcode/ListenKeyFrame.java @@ -38,8 +38,8 @@ public class ListenKeyFrame { frame.add(label); frame.add(buttonIn); frame.add(buttonOut); -// frame.add(jTextField); // 注释 -// frame.add(buttonSubmit); // 注释 + frame.add(jTextField); // 注释 + frame.add(buttonSubmit); // 注释 frame.add(buttonPlay); frame.setFocusableWindowState(true); frame.setAlwaysOnTop(true); diff --git a/oms/src/main/java/com/OmsApplication.java b/oms/src/main/java/com/OmsApplication.java index 732357e..0f5c255 100644 --- a/oms/src/main/java/com/OmsApplication.java +++ b/oms/src/main/java/com/OmsApplication.java @@ -12,7 +12,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; * @since 2017-06-19 */ @SpringBootApplication -@EnableScheduling +//@EnableScheduling @MapperScan(value = {"com.ydd.oms.mapper","com.sv.mapper"}) public class OmsApplication { diff --git a/oms/src/main/java/com/sv/oms/controller/DisclaimersController.java b/oms/src/main/java/com/sv/oms/controller/DisclaimersController.java index 546d8e4..fb7e34b 100644 --- a/oms/src/main/java/com/sv/oms/controller/DisclaimersController.java +++ b/oms/src/main/java/com/sv/oms/controller/DisclaimersController.java @@ -20,17 +20,17 @@ import javax.annotation.Resource; public class DisclaimersController extends OmsController { private final Logger logger = LoggerFactory.getLogger(DisclaimersController.class); - + @Resource private DisclaimersService disclaimersService; /** * 查询免责声明信息 */ - @RequestMapping(value = "/notice/disclaimers", method = RequestMethod.POST) + @RequestMapping(value = "/notice/disclaimers", method = RequestMethod.GET) public ResponseDTO findById() { return ResponseDTO.ok() - .addAttribute("aboutUs", disclaimersService.findById(1)); + .addAttribute("disclaimers", disclaimersService.findById(1)); } /** diff --git a/other/sql/202404.sql b/other/sql/202404.sql index 45663b1..3a235db 100644 --- a/other/sql/202404.sql +++ b/other/sql/202404.sql @@ -32,3 +32,9 @@ CREATE TABLE `sv_disclaimers` ( `deleted` int(3) unsigned DEFAULT '0' COMMENT '删除标识位: 0正常 1删除', PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='免责声明'; + +-- 新增免责声明菜单 +INSERT INTO `smart_venue`.`sys_menu`(`status`, `name`, `en_name`, `url`, `icon`, `parent_id`, `sort`, `remark`, `created_id`, `modified_id`, `created_time`, `modified_time`, `deleted`) VALUES +(0, '免责声明', '免责声明', 'disclaimers/edit', '', 36, 7, '', 0, 0, NOW(), NOW(), 0); + +INSERT sys_role_menu VALUES ('1','52'); diff --git a/service/src/main/java/com/sv/mapper/DisclaimersMapper.java b/service/src/main/java/com/sv/mapper/DisclaimersMapper.java index 127a8f2..f519810 100644 --- a/service/src/main/java/com/sv/mapper/DisclaimersMapper.java +++ b/service/src/main/java/com/sv/mapper/DisclaimersMapper.java @@ -11,9 +11,5 @@ public interface DisclaimersMapper { Disclaimers selectByPrimaryKey(Integer id); - int updateByPrimaryKeySelective(Disclaimers record); - - int updateByPrimaryKeyWithBLOBs(Disclaimers record); - int updateByPrimaryKey(Disclaimers record); -} \ No newline at end of file +} diff --git a/service/src/main/java/com/sv/service/oms/DisclaimersService.java b/service/src/main/java/com/sv/service/oms/DisclaimersService.java index 4517609..82267e6 100644 --- a/service/src/main/java/com/sv/service/oms/DisclaimersService.java +++ b/service/src/main/java/com/sv/service/oms/DisclaimersService.java @@ -35,6 +35,7 @@ public class DisclaimersService extends BaseServiceImpl { // 需要更新或者创建 if (disclaimers.getId() != null && disclaimers.getId() > 0) { // 更新 + disclaimers.setPlatformId(1); disclaimersMapper.updateByPrimaryKey(disclaimers); } else { // 新建 diff --git a/service/src/main/resources/mybatis/mapper/sv/DisclaimersMapper.xml b/service/src/main/resources/mybatis/mapper/sv/DisclaimersMapper.xml index 8338f80..f99648a 100644 --- a/service/src/main/resources/mybatis/mapper/sv/DisclaimersMapper.xml +++ b/service/src/main/resources/mybatis/mapper/sv/DisclaimersMapper.xml @@ -31,7 +31,7 @@ description