更改状态值类型

liwei2917
1 parent 3a7fcd65
Showing 9 changed files with 37 additions and 29 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/entity/ShyComments.java
src/main/java/com/cnlive/shenhe/entity/ShySites.java
src/main/java/com/cnlive/shenhe/entity/ShyUsersfree.java
src/main/java/com/cnlive/shenhe/entity/ShyVideos.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/CommonConst.java
src/main/resources/mapper/ShyUsersfreeMapper.xml
@@ -209,7 +209,7 @@ public class VideosController {
             for (String cid : cids) {
                 ShyVideos shyVideos = videosService.selectByPrimaryKey(Integer.parseInt(cid));
                 if (CommonUtils.isNotNull(shyVideos)) {
-                    if (shyVideos.getState() != CommonConst.AUDIT_INTT || shyVideos.getReceive()) {
+                    if (shyVideos.getState() != CommonConst.AUDIT_INTT || shyVideos.getReceive()==CommonConst.RECEIVE_AFTER) {
                         return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "您领取的内容中有已被领取或者已经被审核，请检查并重试");
                     }
                 } else {
@@ -238,7 +238,7 @@ public class VideosController {
         String[] cids = ids.split(",");
         for (String cid : cids) {
             ShyVideos shyVideos = videosService.selectByPrimaryKey(Integer.parseInt(cid));
-            if (shyVideos.getState() != CommonConst.AUDIT_INTT || !shyVideos.getReceive() || !shyVideos.getReceive_user_id().equals(userId)) {
+            if (shyVideos.getState() != CommonConst.AUDIT_INTT || shyVideos.getReceive()==CommonConst.RECEIVE_BEFORE || !shyVideos.getReceive_user_id().equals(userId)) {
                 return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "退领失败，您选中的内容包含已退领的或已经审核的");
             }
         }
@@ -107,7 +107,7 @@ public class ShyComments {
     /**
      * 领取状态。0：未领取；1：已领取
      */
-    private Boolean receive;
+    private Integer receive;
     /**
      * 领取人id
@@ -499,7 +499,7 @@ public class ShyComments {
      *
      * @return receive - 领取状态。0：未领取；1：已领取
      */
-    public Boolean getReceive() {
+    public Integer getReceive() {
         return receive;
     }
@@ -508,7 +508,7 @@ public class ShyComments {
      *
      * @param receive 领取状态。0：未领取；1：已领取
      */
-    public void setReceive(Boolean receive) {
+    public void setReceive(Integer receive) {
         this.receive = receive;
     }
@@ -26,12 +26,13 @@ public class ShySites {
     private String appid;
-    @Transient
-    private String write_business_name;
     /**
      * 免审业务,多种用,分割
      */
     private String write_business;
+    
+   @Transient
+    private String write_business_name;
     /**
      * @return id
@@ -165,5 +166,4 @@ public class ShySites {
 		this.write_business_name = write_business_name;
 	}
-    
 }
 \ No newline at end of file
@@ -25,7 +25,7 @@ public class ShyUsersfree {
     /**
      * 是否启用，0:未启用，1:启用
      */
-    private Integer is_enable=1;
+    private Integer is_enable;
     /**
      * @return id
@@ -98,18 +98,18 @@ public class ShyUsersfree {
     /**
      * 获取是否启用，0:未启用，1:启用
      *
-     * @return isEnable - 是否启用，0:未启用，1:启用
+     * @return is_enable - 是否启用，0:未启用，1:启用
      */
-    public Integer getIsEnable() {
+    public Integer getIs_enable() {
         return is_enable;
     }
     /**
      * 设置是否启用，0:未启用，1:启用
      *
-     * @param isEnable 是否启用，0:未启用，1:启用
+     * @param is_enable 是否启用，0:未启用，1:启用
      */
-    public void setIsEnable(Integer is_enable) {
+    public void setIs_enable(Integer is_enable) {
         this.is_enable = is_enable;
     }
 }
 \ No newline at end of file
@@ -91,7 +91,7 @@ public class ShyVideos {
     /**
      * 领取状态。0：未领取；1：已领取
      */
-    private Boolean receive;
+    private Integer receive;
     /**
      * 领取人id
@@ -142,7 +142,6 @@ public class ShyVideos {
      * 抽帧返回信息(主要找问题时使用)
      */
     private String avsample_msg;
-    
     @Transient
     private String spid_desc;
@@ -487,7 +486,7 @@ public class ShyVideos {
      *
      * @return receive - 领取状态。0：未领取；1：已领取
      */
-    public Boolean getReceive() {
+    public Integer getReceive() {
         return receive;
     }
@@ -496,7 +495,7 @@ public class ShyVideos {
      *
      * @param receive 领取状态。0：未领取；1：已领取
      */
-    public void setReceive(Boolean receive) {
+    public void setReceive(Integer receive) {
         this.receive = receive;
     }
@@ -195,9 +195,9 @@ public class CommentsServiceImpl {
             String[] cids = ids.split(",");
             for (String cid : cids) {
                 ShyComments shyComments = shyCommentsMapper.selectByPrimaryKey(Integer.parseInt(cid));
-                if (CommonUtils.isNotNull(shyComments) && shyComments.getState() == CommonConst.AUDIT_INTT && !shyComments.getReceive()) {
+                if (CommonUtils.isNotNull(shyComments) && shyComments.getState() == CommonConst.AUDIT_INTT && shyComments.getReceive()==CommonConst.RECEIVE_BEFORE) {
                     shyComments.setReceive_user_id(userId);
-                    shyComments.setReceive(true);
+                    shyComments.setReceive(CommonConst.RECEIVE_AFTER);
                     shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
                     n++;
                 }
@@ -212,7 +212,7 @@ public class CommentsServiceImpl {
             if (!shyCommentsList.isEmpty()) {
                 for (ShyComments shyComments : shyCommentsList) {
                     shyComments.setReceive_user_id(userId);
-                    shyComments.setReceive(true);
+                    shyComments.setReceive(CommonConst.RECEIVE_AFTER);
                     shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
                     n++;
                 }
@@ -226,7 +226,7 @@ public class CommentsServiceImpl {
         String[] cids = ids.split(",");
         for (String cid : cids) {
             ShyComments shyComments = shyCommentsMapper.selectByPrimaryKey(Integer.parseInt(cid));
-            if (shyComments.getState() == CommonConst.AUDIT_INTT && shyComments.getReceive() && userId.equals(shyComments.getReceive_user_id())) {
+            if (shyComments.getState() == CommonConst.AUDIT_INTT && shyComments.getReceive()==CommonConst.RECEIVE_AFTER && userId.equals(shyComments.getReceive_user_id())) {
                 shyComments.setReceive(CommonConst.RECEIVE_BEFORE);
                 shyComments.setReceive_user_id(null);
                 int i = shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
@@ -193,9 +193,9 @@ public class VideosServiceImpl {
             String[] cids = ids.split(",");
             for (String cid : cids) {
                 ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(Integer.parseInt(cid));
-                if (CommonUtils.isNotNull(shyVideos) && shyVideos.getState() == CommonConst.AUDIT_INTT && !shyVideos.getReceive()) {
+                if (CommonUtils.isNotNull(shyVideos) && shyVideos.getState() == CommonConst.AUDIT_INTT && shyVideos.getReceive()==CommonConst.RECEIVE_BEFORE) {
                     shyVideos.setReceive_user_id(userId);
-                    shyVideos.setReceive(true);
+                    shyVideos.setReceive(CommonConst.RECEIVE_AFTER);
                     shyVideosMapper.updateByPrimaryKeySelective(shyVideos);
                     n++;
                 }
@@ -210,7 +210,7 @@ public class VideosServiceImpl {
             if (!shyCommentsList.isEmpty()) {
                 for (ShyVideos shyComments : shyCommentsList) {
                     shyComments.setReceive_user_id(userId);
-                    shyComments.setReceive(true);
+                    shyComments.setReceive(CommonConst.RECEIVE_AFTER);
                     shyVideosMapper.updateByPrimaryKeySelective(shyComments);
                     n++;
                 }
@@ -224,7 +224,7 @@ public class VideosServiceImpl {
         String[] cids = ids.split(",");
         for (String cid : cids) {
             ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(Integer.parseInt(cid));
-            if (shyVideos.getState() == CommonConst.AUDIT_INTT && shyVideos.getReceive() && shyVideos.getReceive_user_id().equals(userId)) {
+            if (shyVideos.getState() == CommonConst.AUDIT_INTT && shyVideos.getReceive()==CommonConst.RECEIVE_AFTER && shyVideos.getReceive_user_id().equals(userId)) {
                 shyVideos.setReceive(CommonConst.RECEIVE_BEFORE);
                 shyVideos.setReceive_user_id(null);
                 int i = shyVideosMapper.updateByPrimaryKey(shyVideos);
@@ -43,11 +43,15 @@ public class CommonConst {
     /**
      * 领取状态：未领
      */
-    public static Boolean RECEIVE_BEFORE = false;
+    public static Integer RECEIVE_BEFORE = 0;
     /**
      * 领取状态：已领
      */
-    public static Boolean RECEIVE_AFTER= true;
+    public static Integer RECEIVE_AFTER= 1;
+    /**
+     * 领取状态：已审
+     */
+    public static Integer RECEIVE_AUDIT= 2;
     /**
      * 用户状态：可用
@@ -69,6 +73,11 @@ public class CommonConst {
      */
     public static Integer BUSINESS_COMMENT = 2;
+    /**
+     * 白名单业务：图文
+     */
+    public static Integer BUSINESS_CONTENT = 3;
+    
     public static JSONObject BUSINESS = JSONObject.parseObject("{\"1\":\"点播业务\",\"2\":\"评论业务\"}");
     /**
@@ -131,7 +140,7 @@ public class CommonConst {
     /**
      * 数美过滤器尺度状态：新闻
      */
-    public static String DYNAMIC_NEWS = "DYNAMIC_NEWS";
+    public static String DYNAMIC_NEWS = "NEWS";
     /**
      * 数美过滤器返回结果：通过
@@ -9,6 +9,6 @@
     <result column="user_id" jdbcType="VARCHAR" property="user_id" />
     <result column="sp_id" jdbcType="INTEGER" property="sp_id" />
     <result column="category" jdbcType="VARCHAR" property="category" />
-    <result column="isEnable" jdbcType="INTEGER" property="isEnable" />
+    <result column="is_enable" jdbcType="INTEGER" property="is_enable" />
   </resultMap>
 </mapper>
 \ No newline at end of file