liupeng 4 years ago
parent
commit
625aea201f

+ 8 - 2
code/sapparent/sapcms/src/main/java/org/fouram/controller/MessageUserController.java

@@ -6,6 +6,8 @@ import org.fouram.dto.input.MessageUserDeleteDTO;
 import org.fouram.dto.input.MessageUserQueryListDTO;
 import org.fouram.dto.input.MessageUserSaveDTO;
 import org.fouram.dto.output.MessageUserQueryListOutput;
+import org.fouram.service.SapMessageUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -21,26 +23,30 @@ import io.swagger.annotations.ApiResponses;
 @Api(value = "消息用户相关接口")
 @RequestMapping(value = "/messageUser")
 public class MessageUserController extends BaseController {
+	
+	@Autowired
+	private SapMessageUserService service;
 
 	@ApiResponses(@ApiResponse(response = MessageUserQueryListOutput.class, code = 200, message = "success"))
 	@ApiOperation(value = "查询发送消息用户列表")
 	@PostMapping(value = "/queryList", produces = "application/json;charset=utf-8")
 	@ResponseBody
 	public Object queryList(@RequestBody MessageUserQueryListDTO dto) throws Exception {
-		return ResultUtil.success(null, "操作成功");
+		return ResultUtil.success(service.selectList(), "操作成功");
 	}
 
 	@ApiOperation(value = "新增消息用户")
 	@PostMapping(value = "/saveUser", produces = "application/json;charset=utf-8")
 	@ResponseBody
 	public Object saveUser(@RequestBody MessageUserSaveDTO dto) throws Exception {
-		return ResultUtil.success(null, "操作成功");
+		return service.saveOne(dto.getUserId());
 	}
 	
 	@ApiOperation(value = "删除消息用户")
 	@PostMapping(value = "/deleteUser", produces = "application/json;charset=utf-8")
 	@ResponseBody
 	public Object deleteUser(@RequestBody MessageUserDeleteDTO dto) throws Exception {
+		service.deleteById(dto.getId());
 		return ResultUtil.success(null, "操作成功");
 	}
 }

+ 4 - 0
code/sapparent/sapservice/src/main/java/org/fouram/core/util/ResultUtil.java

@@ -17,6 +17,10 @@ public class ResultUtil {
 		result.put("msg", msg);
 		return result;
 	}
+	
+	public static PageData success() {
+		return result(true);
+	}
 
 	public static PageData error(String msg) {
 		PageData result = result(false);

+ 1 - 3
code/sapparent/sapservice/src/main/java/org/fouram/dto/input/MessageUserDeleteDTO.java

@@ -4,7 +4,6 @@ import java.io.Serializable;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -19,6 +18,5 @@ public class MessageUserDeleteDTO implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 	
-	@ApiModelProperty(value = "用户id")
-	private String userId;
+	private String id;
 }

+ 0 - 25
code/sapparent/sapservice/src/main/java/org/fouram/dto/input/MessageUserQueryListDTO.java

@@ -2,39 +2,14 @@ package org.fouram.dto.input;
 
 import java.io.Serializable;
 
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 @Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class MessageUserQueryListDTO implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 	
-	@ApiModelProperty(value = "用户姓名")
-	private String name;
-	
-	@ApiModelProperty(value = "同步类型")
-	private String type;
-	
-	@ApiModelProperty(value = "第几页")
-	private Integer pageNumber;
-	
-	@ApiModelProperty(value = "每页条数")
-	private Integer pageSize;
-	
-	private String startTime;
-	
-	private String endTime;
-	
-	private JSONObject page;
 }

+ 1 - 1
code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapMessageUserMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="SapMessageUserMapper">
 	<select id="queryList" resultType="SapMessageUser">
-		select * from sap_message_user where userId = #{userId}
+		select * from sap_message_user
 	</select>
 
 	<insert id="saveOne">

+ 16 - 2
code/sapparent/sapservice/src/main/java/org/fouram/service/SapMessageUserService.java

@@ -1,15 +1,29 @@
 package org.fouram.service;
 
+import java.util.List;
+
+import org.fouram.core.base.model.PageData;
 import org.fouram.core.base.service.BaseService;
+import org.fouram.core.util.ResultUtil;
 import org.fouram.entity.SapMessageUser;
 import org.springframework.stereotype.Service;
 
 @Service
 public class SapMessageUserService extends BaseService {
+	
+	@SuppressWarnings("unchecked")
+	public List<SapMessageUser> selectList() throws Exception {
+		return (List<SapMessageUser>) findList("SapMessageUserMapper.selectList", null);
+	}
 
-	public void saveOne(String userId) throws Exception {
-		SapMessageUser entity = SapMessageUser.builder().userId(userId).build();
+	public PageData saveOne(String userId) throws Exception {
+		SapMessageUser entity = selectByUserId(userId);
+		if(entity != null) {
+			return ResultUtil.error("该用户已保存");
+		}
+		entity = SapMessageUser.builder().userId(userId).build();
 		save("SapMessageUserMapper.saveOne", entity);
+		return ResultUtil.success();
 	}
 
 	public SapMessageUser selectByUserId(String userId) throws Exception {