--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/articlelibrary/SaveUpdateArticleLibraryForm.java

@@ -16,8 +16,8 @@ public class SaveUpdateArticleLibraryForm {
 	private String title;
 	@ApiModelProperty("正文")
 	private String text;
-	@ApiModelProperty("分类：0其他、体育、美食、军事、运势、科学、旅游、历史、科技、时政、社会、国际、公益、文化、房产、财经、传媒、动漫、教育、汽车、健康、时尚、情感、宗教、育儿、娱乐、游戏、职场、家居、彩票、星座、搞笑")
-	private Integer type;
+	@ApiModelProperty("分类")
+	private String type;
 	@ApiModelProperty("定时发布时间")
 	private Date timingTime;
 	@ApiModelProperty("资源类型 1文本，2图文章")

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ArticleLibrary.java

@@ -24,7 +24,7 @@ public class ArticleLibrary {
 	@ApiModelProperty("正文")
 	private String text;
 	@ApiModelProperty("类型")
-	private Integer type;
+	private String type;
 	@ApiModelProperty("定时发布时间")
 	private Date timingTime;
 	@ApiModelProperty("发布状态：0未发布，1已发布，2定时发布")

com.zrqx.core/src/main/java/com/zrqx/core/util/https/HttpClientUtil.java

@@ -4,8 +4,6 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.message.BasicHeader;
 import org.apache.http.util.EntityUtils;
 public class HttpClientUtil {
 	   @SuppressWarnings("resource")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/user/UserController.java

@@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import scala.collection.generic.BitOperations.Int;
+
 import com.zrqx.core.constant.resource.ResourceRequestPath;
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
 import com.zrqx.core.enums.ResponseCodeEnum;
@@ -159,7 +161,11 @@ public class UserController {
 		List<UserAccountRelation> list = accountRelationService.selectByCriteria();
 		return CallBack.success(list);
 	}
-	
+	@ApiOperation(value = "查询账号总数", notes = "查询账号")
+	@GetMapping(value = ResourceRequestPath.COUNT_SUM)
+	public CallBack<Integer> publishCount(@RequestBody Integer status) {
+		return CallBack.success(accountRelationService.accountCount(status));
+	}
 	@ApiOperation(value = "删除关联账号", notes = "删除关联账号")
 	@PostMapping(value = ResourceRequestPath.BATCH + ResourceRequestPath.DELETE)
 	public CallBack<String> deleteByIds(@RequestBody String oid) {

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/user/UserAccountRelationMapper.java

 package com.zrqx.resource.bg.mapper.user;
 
+import org.apache.ibatis.annotations.Select;
+
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.sysuser.user.UserAccountRelation;
 /**
@@ -7,6 +9,11 @@ import com.zrqx.core.model.sysuser.user.UserAccountRelation;
  *
  */
 public interface UserAccountRelationMapper extends BaseMapper<UserAccountRelation> {
+	@Select("<script>" 
+			+ "SELECT count(*) from user_account_relation where isDelete=#{status} "                   
+	        + "</script>")
+	
+	Integer accountCount(Integer status);
 
 	
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/user/UserAccountRelationService.java

@@ -7,5 +7,7 @@ import com.zrqx.core.service.BaseService;
  * 用户service
  */
 public interface UserAccountRelationService extends BaseService<UserAccountRelation,String> {
+
+	Integer accountCount(Integer status);
 }
 	
\ No newline at end of file

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/user/UserAccountRelationServiceImpl.java

@@ -23,5 +23,10 @@ public class UserAccountRelationServiceImpl extends BaseServiceImpl<UserAccountR
 		// TODO Auto-generated method stub
 		return accountRelationMapper;
 	}
+	@Override
+	public Integer accountCount(Integer status) {
+		// TODO Auto-generated method stub
+		return accountRelationMapper.accountCount(status);
+	}
 	
 }