添加字典表的查询接口

user-client/src/main/java/com/hp/user/client/entity/AddressVO.java

@@ -1,5 +1,4 @@
 package com.hp.user.client.entity;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 

user-client/src/main/java/com/hp/user/client/entity/DictionariesVO.java

@@ -0,0 +1,67 @@
+package com.hp.user.client.entity;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 王怡静
+ * @since 2020-12-02
+ */
+public class DictionariesVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 字典表id
+     */
+    private String dictionariesId;
+
+    /**
+     * 父字典码
+     */
+    private String parentId;
+
+    /**
+     * 值
+     */
+    private String value;
+    /**
+     * 类型
+     */
+    private Integer type;
+
+	public String getDictionariesId() {
+		return dictionariesId;
+	}
+
+	public void setDictionariesId(String dictionariesId) {
+		this.dictionariesId = dictionariesId;
+	}
+
+	public String getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(String parentId) {
+		this.parentId = parentId;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+}

user-client/src/main/java/com/hp/user/client/service/DictionariesService.java

@@ -0,0 +1,19 @@
+package com.hp.user.client.service;
+
+import com.hp.user.client.entity.DictionariesVO;
+import com.hp.user.client.entity.ListResult;
+/**
+ * 字典表
+ * @author yeqid
+ * @since 2020/12/02
+ */
+public interface DictionariesService {
+	
+	/**
+	 * 根据字典类型查询字典表
+	 * @param type
+	 * @return
+	 */
+	public ListResult<DictionariesVO> queryByType(Integer type);
+
+}

user-service/src/main/java/com/hp/user/service/controller/AuthenticationController.java

@@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.hp.user.client.entity.AccountVO;
 import com.hp.user.client.entity.DataResult;
 import com.hp.user.client.service.AccountService;
-import com.hp.user.service.utils.HttpResult;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

user-service/src/main/java/com/hp/user/service/controller/DictionariesController.java

@@ -0,0 +1,35 @@
+package com.hp.user.service.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.hp.user.client.entity.DictionariesVO;
+import com.hp.user.client.entity.ListResult;
+import com.hp.user.client.service.DictionariesService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Api(tags = "字典表")
+@RestController
+@RequestMapping("/dictionaries")
+public class DictionariesController {
+	
+	@Autowired
+	private DictionariesService dictionariesService;
+	
+	/**
+     * 根据字典类型查询字典
+     */
+	@RequestMapping("/queryByType")
+    @ApiOperation(value = "根据字典类型查询字典", notes = "根据字典类型查询字典", httpMethod = "GET")
+	public ListResult<DictionariesVO> queryByType(Integer type) {
+		ListResult<DictionariesVO> result = dictionariesService.queryByType(type);
+		return result;
+		
+	}
+
+}

user-service/src/main/java/com/hp/user/service/dao/DictionariesMapper.java

@@ -0,0 +1,8 @@
+package com.hp.user.service.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hp.user.service.entity.Dictionaries;
+
+public interface DictionariesMapper extends BaseMapper<Dictionaries>{
+
+}

user-service/src/main/java/com/hp/user/service/entity/Dictionaries.java

@@ -0,0 +1,45 @@
+package com.hp.user.service.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yeqid
+ * @since 2020-12-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_dictionaries")
+public class Dictionaries implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "dictionaries_id")
+    private String dictionariesId;
+
+    /**
+     * 父字典码
+     */
+    private String parentId;
+
+    /**
+     * 值
+     */
+    private String value;
+    /**
+     * 类型
+     */
+    private Integer type;
+
+
+}

user-service/src/main/java/com/hp/user/service/impl/AccountServiceImpl.java

@@ -135,14 +135,14 @@ public class AccountServiceImpl implements AccountService {
 			BeanUtils.copyProperties(findAccount, account);
 			if(null != findAccount) {
 				result.setCode("-1");
-	        	result.setCode("微信需要绑定");
+	        	result.setMessage("微信需要绑定");
 			}else {
 				result.setData(account);
 			}
 	        
 		}catch(Exception e) {
 			result.setCode("-1");
-        	result.setCode("系统出现问题");
+        	result.setMessage("系统出现问题");
 		}
 		return result;
 		
@@ -167,12 +167,12 @@ public class AccountServiceImpl implements AccountService {
 					result.setData(accountVO);
 				}else {
 					result.setCode("-1");
-		        	result.setCode("手机号码已经存在");
+		        	result.setMessage("手机号码已经存在");
 					return result;
 				}
 			}else {
 				result.setCode("-1");
-	        	result.setCode("手机号不能为空");
+	        	result.setMessage("手机号不能为空");
 				return result;
 			}
 			

user-service/src/main/java/com/hp/user/service/impl/DictionariesServiceImpl.java

@@ -0,0 +1,45 @@
+package com.hp.user.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hp.user.client.entity.DictionariesVO;
+import com.hp.user.client.entity.ListResult;
+import com.hp.user.client.service.DictionariesService;
+import com.hp.user.service.dao.DictionariesMapper;
+import com.hp.user.service.entity.Dictionaries;
+
+@Service
+public class DictionariesServiceImpl implements DictionariesService{
+	
+	@Autowired
+	private DictionariesMapper dictionariesMapper;
+
+	@Override
+	public ListResult<DictionariesVO> queryByType(Integer type) {
+		ListResult<DictionariesVO> result = new ListResult<>();
+		try {
+			QueryWrapper<Dictionaries> queryWrapper = new QueryWrapper<Dictionaries>();
+			queryWrapper.eq("type", type);
+			List<Dictionaries> list = dictionariesMapper.selectList(queryWrapper);
+			DictionariesVO dictionariesVO;
+			List<DictionariesVO> newList = new ArrayList<>();
+			for(Dictionaries dictionaries : list) {
+				dictionariesVO = new DictionariesVO();
+				BeanUtils.copyProperties(dictionaries, dictionariesVO);
+				newList.add(dictionariesVO);
+			}
+			result.setDataList(newList);
+		}catch(Exception e) {
+			result.setCode("-1");
+			result.setMessage("系统内部错误");
+		}
+		return result;
+	}
+
+}

user-service/src/main/resources/mapper/DictionariesMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hp.user.service.dao.DictionariesMapper">
+
+</mapper>

user-service/src/test/java/com/hp/user/service/AccountServiceTest.java

@@ -0,0 +1,54 @@
+package com.hp.user.service;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hp.user.client.entity.AccountVO;
+import com.hp.user.client.service.AccountService;
+import com.hp.user.service.utils.WeixinSignUtil;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class AccountServiceTest {
+	
+	@Autowired
+	private AccountService accountService;
+	
+	@Test
+	public void checkPhoneTest() {
+		AccountVO account = new AccountVO();
+		account.setPhone("18668123093");
+		account.setUserName("ye");
+		accountService.register(account);
+	}
+	
+	@Test
+	public void bindWx() {
+		String userId = "1332956635093651457";
+		String wx = "527610617";
+		accountService.bindWx(userId, wx);
+	}
+	@Test
+	public void wxAuthorization() {
+//		accountService.wxAuthorization("001QSW000EMPJK1ZFg300SotTz4QSW0X");
+		String code = "031kX8ml2rh0464pYUol2kYuN94kX8md";
+//		JSONObject data = WeixinSignUtil.getCode2Session(code);
+//		String access_token = "39_K8OLop7Aguy8gVNTDIDIqIo6GNvFhSgbOtrPdM3HYl9cbaqBhzxQStNKHbeOxDRDHwrvgwL8Y4ANuxKt81qAgJWtig-mP8EUWsx34lWcW9jPMOCh-Qgm9glDlGEFlC0CBDRBaSKQvrxJZd6jMZIcAIAYLU";
+//        System.out.println(data);
+        
+        
+        
+        
+        
+        
+        JSONObject data2 = WeixinSignUtil.getAccessToken(code);
+        String token = data2.getString("access_token");
+        System.out.println(data2);
+        JSONObject data1 = WeixinSignUtil.getUserInfo(token,"orNdJ4yNtN3_7GCpnW-A_wyuuhdw");
+        System.out.println(data1);
+	}
+}

user-service/src/test/java/com/hp/user/service/DictionariesServiceTest.java

@@ -0,0 +1,103 @@
+package com.hp.user.service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.hp.user.client.service.DictionariesService;
+import com.hp.user.service.dao.DictionariesMapper;
+import com.hp.user.service.entity.Dictionaries;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class DictionariesServiceTest {
+	@Autowired
+	private DictionariesMapper dictionariesMapper;
+	
+	@Test
+	public void createDictionariesService() {
+		Dictionaries dictionaries;
+		Map<String,List<String>> map = new HashMap<>();
+		List<String> list = new ArrayList<>();
+		list.add("安装电工（中级）");
+		list.add("安装钳工（中级）");
+		list.add("机械设备安装工（中级）");
+		list.add("木工（中级）");
+		list.add("通风工（中级）");
+		list.add("管道工（中级）");
+		list.add("电工（中级）");
+		list.add("维修电工（中级）");
+		list.add("砌筑工（中级）");
+		list.add("低压电工（中级）");
+		list.add("焊工（中级）");
+		list.add("油漆工（中级）");
+		map.put("技术员", list);
+		list = new ArrayList<>();
+		list.add("设备安装施工员");
+		list.add("设备安装质量员");
+		list.add("材料员");
+		list.add("机械员");
+		list.add("劳务员");
+		list.add("资料员");
+		list.add("标准员");
+		map.put("七大员", list);
+		list = new ArrayList<>();
+		list.add("特种作业证（高压电工）");
+		list.add("特种作业证（继电保护）");
+		list.add("特种作业证（电力电缆）");
+		list.add("特种作业证（电气试验）");
+		list.add("特种作业证（低压电工）");
+		list.add("特种作业证（高处安装、维护、拆除）");
+		list.add("特种作业证（熔化焊接与热切割）");
+		map.put("特种作业证", list);
+		list = new ArrayList<>();
+		list.add("建筑施工企业（主要负责人）");
+		list.add("建筑施工企业（项目负责人）");
+		list.add("建筑施工企业（专职生产安全管理人员）");
+		map.put("建筑施工企业", list);
+		list = new ArrayList<>();
+		list.add("建造师（一级）");
+		list.add("建造师（二级）");
+		map.put("建造师", list);
+		list = new ArrayList<>();
+		list.add("建筑电工");
+		list.add("建筑焊工（含焊接工、切割工）");
+		list.add("建筑普通脚手架架子工");
+		list.add("建筑附着升降脚手架架子工");
+		list.add("建筑起重信号司索工(含指挥)");
+		list.add("建筑塔式起重机司机");
+		list.add("建筑施工升降机司机");
+		list.add("建筑物料提升机司机");
+		list.add("建筑塔式起重机安装拆卸工");
+		list.add("建筑施工升降机安装拆卸工");
+		list.add("建筑物料提升机安装拆卸工");
+		list.add("高处作业吊篮安装拆卸工");
+		map.put("建筑施工特种作业证", list);
+		for(Entry<String, List<String>> entry : map.entrySet()) {
+			String parentId = IdWorker.getIdStr();
+			for(String value : entry.getValue()) {
+				dictionaries =  new Dictionaries();
+				dictionaries.setDictionariesId(IdWorker.getIdStr());
+				dictionaries.setParentId(parentId);
+				dictionaries.setValue(value);
+				dictionaries.setType(1000);
+				dictionariesMapper.insert(dictionaries);
+			}
+			dictionaries =  new Dictionaries();
+			dictionaries.setDictionariesId(parentId);
+			dictionaries.setValue(entry.getKey());
+			dictionaries.setType(1000);
+			dictionariesMapper.insert(dictionaries);
+		}
+		
+	}
+}