代理模块接口

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentAuditController.java

@@ -1,60 +1,113 @@
 package com.fdkankan.agent.controller;
 
 
+import com.fdkankan.agent.controller.request.RequestAgentAudit;
+import com.fdkankan.agent.controller.request.RequestNote;
+import com.fdkankan.agent.controller.request.RequestSearch;
+import com.fdkankan.agent.entity.AgentAudit;
 import com.fdkankan.agent.service.IAgentAuditService;
 import com.fdkankan.common.constant.ConstantRegex;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.response.ResultData;
+import com.fdkankan.common.validation.ValidationUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.LinkedHashMap;
+import java.util.List;
 
 //经销商申请模块
 @RestController
 @RequestMapping("/api")
 public class AgentAuditController {
 
-
     @Autowired
     IAgentAuditService agentAuditService;
 
+    private static Logger log = LoggerFactory.getLogger("programLog");
 
     /**
      * 保存申请信息
-     * @param name  经销商名称
-     * @param address   地址
-     * @param country   国家
-     * @param surName   申请人的姓
-     * @param userName  申请人的名字
-     * @param post  申请人职位
-     * @param areaCode  区号
-     * @param phone  手机号
-     * @param email 邮箱地址
-     * @param region  地区
-     * @return
-     * @throws Exception
      */
     @PostMapping("/agentAduit/save")
     public ResultData agentAuditSave(
-            @RequestParam(required = true) String name,
-            @RequestParam(required = true) String address,
-            @RequestParam(required = true) String country,
-            @RequestParam(required = true) String surName,
-            @RequestParam(required = true) String userName,
-            @RequestParam(required = true) String post,
-            @RequestParam(required = true) String areaCode,
-            @RequestParam(required = true) String phone,
-            @RequestParam(required = true) String email,
-            @RequestParam(required = true) String region
-    ) throws Exception {
-
-        if(!email.matches(ConstantRegex.EMAIL_REGEX)){
+            @RequestBody RequestAgentAudit param) throws Exception {
+        if(param == null || StringUtils.isEmpty(param.getName()) || StringUtils.isEmpty(param.getAddress()) ||
+                StringUtils.isEmpty(param.getCountry()) || StringUtils.isEmpty(param.getRegion()) ||
+                StringUtils.isEmpty(param.getSurName()) || StringUtils.isEmpty(param.getUserName()) ||
+                StringUtils.isEmpty(param.getPost()) || StringUtils.isEmpty(param.getAreaCode()) ||
+                StringUtils.isEmpty(param.getPhone()) || StringUtils.isEmpty(param.getEmail())){
+            return ResultData.error(ErrorCode.FAILURE_CODE_3001);
+        }
+
+        if(!param.getEmail().matches(ConstantRegex.EMAIL_REGEX)){
             return ResultData.error(ErrorCode.FAILURE_CODE_3019);
         }
 
-        return ResultData.ok("");
+        AgentAudit agentAudit = new AgentAudit();
+        BeanUtils.copyProperties(param,agentAudit);
+        agentAudit.setRecStatus("A");
+        agentAudit.setNoteType(1);
+        agentAudit.setState(1);
+        agentAuditService.insert(agentAudit);
+        return ResultData.ok();
+    }
+
+    @GetMapping("/manager/agentAduit/list")
+    public ResultData list(
+            @RequestParam(value="pageNum", defaultValue="1", required = false) Integer pageNum,
+            @RequestParam(value="pageSize", defaultValue="10", required = false) Integer pageSize) throws Exception{
+
+        LinkedHashMap<String,String> condition = new LinkedHashMap<>();
+        condition.put("rec_status = 'A'","and");
+        List<AgentAudit> agentAuditList = agentAuditService.getList(condition,pageNum, pageSize, "create_time desc");
+        int count = agentAuditService.getCount(condition, null);
+        return ResultData.ok(pageNum,pageSize,count,agentAuditList);
+    }
+
+    @PostMapping("/manager/agentAduit/update/active/{id}/{state}")
+    private ResultData updateActive(
+            @PathVariable("id") Long id, @PathVariable("state") String state) throws Exception{
+        LinkedHashMap<String,String> condition = new LinkedHashMap<>();
+        condition.put("id ="+id,"and");
+        condition.put("rec_status = 'A'","and");
+        AgentAudit agentAudit = agentAuditService.getOne(condition);
+        int iState = Integer.parseInt(state);
+        if (agentAudit == null || !ValidationUtils.validateState(iState)) {
+            log.info("state: {}", state);
+            return ResultData.error(ErrorCode.FAILURE_CODE_3001);
+        }
+        agentAudit.setState(iState);
+        agentAuditService.update(agentAudit);
+        return ResultData.ok();
+    }
+
+
+    @PostMapping("/manager/agentAduit/update/note")
+    private ResultData updateNote(@RequestBody RequestNote param){
+        LinkedHashMap<String,String> condition = new LinkedHashMap<>();
+        condition.put("id ="+param.getId(),"and");
+        condition.put("rec_status = 'A'","and");
+        AgentAudit agentAudit = agentAuditService.getOne(condition);
+        if (agentAudit == null) {
+            return ResultData.error(ErrorCode.FAILURE_CODE_3001);
+        }
+        if (!ValidationUtils.validateInteger(param.getNoteType())){
+            log.info("NoteType: {}", param.getNoteType());
+            return ResultData.error(ErrorCode.FAILURE_CODE_3001);
+        }
+        agentAudit.setNoteType(param.getNoteType());
+        agentAudit.setNoteContent(param.getNoteContent());
+        agentAuditService.update(agentAudit);
+        return ResultData.ok();
     }
 
+    @PostMapping("/manager/agentAduit/search")
+    private ResultData search(@RequestBody RequestSearch param) {
+        return  agentAuditService.searchLike(param);
+    }
 }

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/request/RequestAgentAudit.java

@@ -0,0 +1,61 @@
+package com.fdkankan.agent.controller.request;
+
+import com.fdkankan.common.base.request.RequestBase;
+import lombok.Data;
+
+@Data
+public class RequestAgentAudit extends RequestBase {
+
+    /**
+     * 经销商公司名称
+     */
+    private String name;
+    /**
+     * 国家
+     */
+    private String country;
+    /**
+     * 地区
+     */
+    private String region;
+    /**
+     * 地址
+     */
+    private String address;
+    /**
+     * 类型，1为线下，2为线上
+     */
+    private Integer type;
+    /**
+     * 线下门店地址或线上网站
+     */
+    private String storeAddress;
+    /**
+     * 申请人的姓
+     */
+    private String surName;
+    /**
+     * 状态，0申请中，1审核通过，2审核失败
+     */
+    private int state;
+    /**
+     * 申请人的名字
+     */
+    private String userName;
+    /**
+     * 申请人职位
+     */
+    private String post;
+    /**
+     * 区号
+     */
+    private String areaCode;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 邮箱地址
+     */
+    private String email;
+}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/request/RequestNote.java

@@ -0,0 +1,25 @@
+package com.fdkankan.agent.controller.request;
+
+
+import com.fdkankan.common.base.request.RequestBase;
+import lombok.Data;
+
+/**
+ * 备注信息
+ */
+
+@Data
+public class RequestNote extends RequestBase {
+
+    private Long id;
+
+    /**
+     * 备注等级
+     */
+    private Integer noteType;
+
+    /**
+     * 备注内容
+     */
+    private String noteContent;
+}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/request/RequestSearch.java

@@ -0,0 +1,17 @@
+package com.fdkankan.agent.controller.request;
+
+import com.fdkankan.common.base.request.RequestBase;
+import lombok.Data;
+
+@Data
+public class RequestSearch extends RequestBase {
+
+    private String itemName;
+
+    private String startDate;
+
+    private String endDate;
+
+    private String type;
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentAuditService.java

@@ -1,9 +1,12 @@
 package com.fdkankan.agent.service;
 
+import com.fdkankan.agent.controller.request.RequestSearch;
 import com.fdkankan.agent.entity.AgentAudit;
 import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.common.response.ResultData;
 
 public interface IAgentAuditService extends IServiceOperations<AgentAudit> {
 
+    ResultData searchLike(RequestSearch param);
 }
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentAuditService.java

@@ -1,13 +1,18 @@
 package com.fdkankan.agent.service.impl;
 
+import com.fdkankan.agent.controller.request.RequestSearch;
 import com.fdkankan.agent.entity.AgentAudit;
 import com.fdkankan.agent.mapper.IAgentAuditMapper;
 import com.fdkankan.agent.service.IAgentAuditService;
 import com.fdkankan.common.base.AbstractService;
 import com.fdkankan.common.base.IOperations;
+import com.fdkankan.common.response.ResultData;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.LinkedHashMap;
+import java.util.List;
 
 @Service("AgentAuditService")
 public class AgentAuditService extends AbstractService<AgentAudit> implements IAgentAuditService {
@@ -26,5 +31,30 @@ public class AgentAuditService extends AbstractService<AgentAudit> implements IA
 	public void setTableName(String tableName){
 		this.tableName = tableName;
 	}
+
+	@Override
+	public ResultData searchLike(RequestSearch param) {
+		Integer pageNum = Integer.valueOf(param.getPageNum());
+		Integer pageSize = Integer.valueOf(param.getPageSize());
+		String startDate = param.getStartDate();
+		String endDate = param.getEndDate();
+		String itemName = param.getItemName();
+
+		LinkedHashMap<String,String> condition = new LinkedHashMap<>();
+		condition.put("rec_status ='A'","and");
+		if(StringUtils.isNotBlank(startDate)){
+			condition.put("create_time >= '"+startDate+"'","and");
+		}
+		if(StringUtils.isNotBlank(endDate)){
+			condition.put("create_time <= '"+endDate+"' ","and");
+		}
+		if(StringUtils.isNotBlank(itemName)){
+			condition.put("((audit_name like '%"+itemName+"%' )","and");
+			condition.put("(address like '%"+itemName+"%' )","or");
+			condition.put("(note_content like '%"+itemName+"%' ))","or");
+		}
+		List<AgentAudit> list = this.getAllList(condition, "create_time desc");
+		return ResultData.ok(pageNum,pageSize,list.size(),list);
+	}
 }
 

4dkankan-center-platform/src/main/resources/application.yml

@@ -19,7 +19,7 @@ spring:
     nacos:
       discovery:
         port: ${discoveryPort:8848}
-        server-addr: 127.0.0.1
+        server-addr: 192.168.0.47
   application:
     name: platform
   datasource:

4dkankan-common/src/main/java/com/fdkankan/common/base/AbstractService.java

@@ -1,6 +1,7 @@
 package com.fdkankan.common.base;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 
@@ -30,6 +31,12 @@ public abstract class AbstractService<T extends Serializable> implements IServic
 	public int update(List<T> list) {
 		return getMapper().update(list, this.getTableName());
 	}
+	@Override
+	public int update(T entity) {
+		List<T> entityList = new ArrayList<>();
+		entityList.add(entity);
+		return getMapper().update(entityList, this.getTableName());
+	}
 
 	@Override
 	public int updateByBatch(LinkedHashMap<String, String> condition, String field) {

4dkankan-common/src/main/java/com/fdkankan/common/base/IServiceOperations.java

@@ -14,6 +14,8 @@ public interface IServiceOperations<T extends Serializable> extends IOperations<
 
 	int update(List<T> list);
 
+	int update (final T entity);
+
 	int updateByBatch(LinkedHashMap<String, String> condition, String field);
 
 	T getById(final int id);

4dkankan-common/src/main/java/com/fdkankan/common/base/request/RequestBase.java

@@ -0,0 +1,16 @@
+package com.fdkankan.common.base.request;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class RequestBase implements Serializable {
+
+    private int pageNum;
+
+    private int pageSize;
+
+    private int start;
+
+}

4dkankan-common/src/main/java/com/fdkankan/common/response/PageInfo.java

@@ -0,0 +1,16 @@
+package com.fdkankan.common.response;
+
+import lombok.Data;
+
+@Data
+public class PageInfo {
+
+    private int page;
+
+    private int pageSize;
+
+    private int total;
+
+    private Object list;
+
+}

4dkankan-common/src/main/java/com/fdkankan/common/response/ResultData.java

@@ -43,6 +43,15 @@ public class ResultData implements Serializable {
         return base(200, msg, data,true);
     }
 
+    public static ResultData ok(int page,int pageSize,int total,Object data){
+        PageInfo pageInfo = new PageInfo();
+        pageInfo.setPage(page);
+        pageInfo.setPageSize(pageSize);
+        pageInfo.setTotal(total);
+        pageInfo.setList(data);
+        return  ok(pageInfo);
+    }
+
     public static ResultData error(int code, String msg) {
         return error(code, msg, ""); }
     public static ResultData error(int code, String msg, Object data) {

4dkankan-common/src/main/java/com/fdkankan/common/validation/ValidationUtils.java

@@ -0,0 +1,208 @@
+package com.fdkankan.common.validation;
+
+import org.springframework.util.StringUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class ValidationUtils {
+
+    /** Email */
+    public static final String EMAIL_PATTERN = "^([a-z0-9A-Z]+[-|_|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z0-9]{2,40}$" ;
+
+    /** Age 1-120  */
+    public static final String AGE_PATTERN="^(?:[1-9][0-9]?|1[01][0-9]|120)$";
+
+    /** URL、http、www、ftp */
+    public static final String URL_PATTERN = "http(s)?://([\\w-]+\\.)+[\\w-]+(/[\\w- ./?%&=]*)?" ;
+
+    /** No. */
+    public static final String INTEGER_PATTERN = "^([+-]?)\\d*\\.?\\d+$" ;
+
+    /** String. */
+    public static final String STRING_PATTERN = "^[\\u4E00-\\u9FFF\\sA-za-z]+$";
+//    public static final String STRING_PATTERN = "^[\\u4E00-\\u9FFF\\sA-za-z\\d*]+$";
+
+    /** Chinese. */
+    public static final String CHINESE_NAME = "^[\\u4E00-\\u9FFF\\W]+$";
+
+    /** PhoenNo. */
+    public static final String PHONE_NO = "^[0-9 ]{1,20}$";
+
+    /** PhoneCountry. */
+    public static final String PHONE_COUNTRY = "^[0-9\\ \\+\\-\\(\\)]{1,22}$";
+
+    /** HkID. */
+    public static final String HK_ID = "[a-zA-Z]{1}[0-9a-zA-Z]{6}\\([0-9]{1}\\)";
+
+    /** Only String and space */
+    public static final String ONLY_STRING_SPACE="^[A-Za-z\\s\\u4E00-\\u9FFF\\W]+$";
+
+
+
+    /** RecStatus */
+    public static boolean validateRecStatus(String str){
+        if(StringUtils.isEmpty(str)){
+            return Boolean.FALSE ;
+        }
+        if ("A".equals(str) || "I".equals(str)){
+            return Boolean.TRUE;
+        }
+        return Boolean.FALSE;
+    }
+
+
+
+    /**
+     * plan、marital
+     */
+    public static boolean validateInteger(int i){
+        if(i == 1 || i == 2 || i == 3 || i == 4 || i == 5){
+            return Boolean.TRUE ;
+        }
+        return Boolean.FALSE;
+    }
+
+    public static boolean validateString(String i){
+        if("1".equals(i) || "2".equals(i)){
+            return Boolean.TRUE ;
+        }
+        return Boolean.FALSE;
+    }
+
+
+
+
+    /**  Email */
+    public static boolean validateEamil(final String email){
+        if(StringUtils.isEmpty(email)){
+            return Boolean.FALSE ;
+        }
+        return email.matches(EMAIL_PATTERN) ;
+    }
+
+
+    /**  URL */
+    public static boolean validateUrl(final String url){
+        if(StringUtils.isEmpty(url)){
+            return Boolean.FALSE ;
+        }
+        return url.matches(URL_PATTERN) ;
+    }
+
+    /**
+     * Date
+     * str to Date check
+     */
+    public static boolean validateDate(String date){
+        if(StringUtils.isEmpty(date)){
+            return Boolean.FALSE ;
+        }
+        try {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            dateFormat.parse(date);
+        }   catch (ParseException e) {
+            return Boolean.FALSE;
+        }
+        return Boolean.TRUE;
+    }
+
+    /**
+     * Date
+     * date check
+     */
+    public static boolean validateDate(Date date){
+        try {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+            formatter.format(date);
+            if(date.after(new Date())){
+                return Boolean.FALSE;
+            }
+        }   catch (Exception e) {
+            return Boolean.FALSE;
+        }
+        return Boolean.TRUE;
+    }
+
+
+
+
+    /**  Message */
+    public static boolean validateMsg(String name, int start , int end){
+        if(StringUtils.isEmpty(name)){
+            return Boolean.FALSE ;
+        }
+        if (name.length() >= start && name.length() <= end){
+            return Boolean.TRUE ;
+        }
+        return Boolean.FALSE;
+    }
+
+
+    /**  PhoenNo */
+    public static boolean validatePhoenNo(String str){
+        if(StringUtils.isEmpty(str)){
+            return Boolean.FALSE ;
+        }
+        return str.matches(PHONE_NO) ;
+    }
+
+
+    /**  PhoneCountry */
+    public static boolean validatePhoneCountry(String str){
+        if(StringUtils.isEmpty(str)){
+            return Boolean.FALSE ;
+        }
+        return str.matches(PHONE_COUNTRY) ;
+    }
+
+
+
+
+
+    /**  check Float */
+    public static boolean validateFloat(String str){
+        if(StringUtils.isEmpty(str)){
+            return Boolean.FALSE ;
+        }
+        String key = "[+]?[0-9]*\\.?[0-9]{2}+";
+        return str.matches(key) ;
+    }
+
+
+
+    /**  compareDate */
+    public static boolean compareDate(String str){
+        if(StringUtils.isEmpty(str)){
+            return Boolean.FALSE ;
+        }
+        try {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = dateFormat.parse(str);
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date());
+            calendar.add(Calendar.DAY_OF_MONTH, -15);
+            Date nowDate = dateFormat.parse(dateFormat.format(calendar.getTime()));
+            if (date.before(nowDate)){
+                return Boolean.TRUE;
+            } else {
+                return Boolean.FALSE;
+            }
+        }   catch (ParseException e) {
+            return Boolean.FALSE;
+        }
+    }
+
+
+
+
+    public static boolean validateState(int i){
+        if(i == 0 || i == 1 ){
+            return Boolean.TRUE ;
+        }
+        return Boolean.FALSE;
+    }
+
+}

pom.xml

@@ -28,7 +28,7 @@
         <hutool-version>5.7.17</hutool-version>
         <spring.cloud-version>Hoxton.SR8</spring.cloud-version>
         <fdkankan.common-version>2.0.0</fdkankan.common-version>
-        <fastjson-version>1.2.58</fastjson-version>
+        <fastjson-version>1.2.79</fastjson-version>
         <servlet-api-version>2.4</servlet-api-version>
         <spring.boot-mybatis-version>1.3.2</spring.boot-mybatis-version>
         <druid-version>1.1.17</druid-version>