202404 免责声明

.gitignore

@@ -25,4 +25,6 @@ hs_err_pid*
 
 */target
 
+target
+
 *.iml

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(jTextField); // 注释
-//        frame.add(buttonSubmit); // 注释
+        frame.add(buttonSubmit); // 注释
         frame.add(buttonPlay);
         frame.setFocusableWindowState(true);
         frame.setAlwaysOnTop(true);

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 {
 

oms/src/main/java/com/sv/oms/controller/DisclaimersController.java

@@ -27,10 +27,10 @@ public class DisclaimersController extends OmsController {
 	/**
 	 * 查询免责声明信息
 	 */
-	@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));
 	}
 
 	/**

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');

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);
 }

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 {
 			// 新建

service/src/main/resources/mybatis/mapper/sv/DisclaimersMapper.xml

@@ -105,7 +105,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.sv.entity.Disclaimers" >
+  <update id="updateByPrimaryKey" parameterType="com.sv.entity.Disclaimers" >
     update sv_disclaimers
     <set >
       <if test="platformId != null" >
@@ -132,25 +132,4 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.sv.entity.Disclaimers" >
-    update sv_disclaimers
-    set platform_id = #{platformId,jdbcType=INTEGER},
-      created_id = #{createdId,jdbcType=INTEGER},
-      modified_id = #{modifiedId,jdbcType=INTEGER},
-      created_time = #{createdTime,jdbcType=TIMESTAMP},
-      modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
-      deleted = #{deleted,jdbcType=INTEGER},
-      description = #{description,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.sv.entity.Disclaimers" >
-    update sv_disclaimers
-    set platform_id = #{platformId,jdbcType=INTEGER},
-      created_id = #{createdId,jdbcType=INTEGER},
-      modified_id = #{modifiedId,jdbcType=INTEGER},
-      created_time = #{createdTime,jdbcType=TIMESTAMP},
-      modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
-      deleted = #{deleted,jdbcType=INTEGER}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
 </mapper>