企业注册

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/CompanyTypeEnum.java

+package com.yeejoin.amos.boot.module.ugp.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Getter
+@AllArgsConstructor
+public enum CompanyTypeEnum {
+
+    建设单位("CONSTRUCTION","建设单位"),
+    安装单位("INSTALL","安装单位"),
+    设计单位("DESIGN","设计单位"),
+    监检机构("MONITORING","监检机构");
+
+    String key;
+    String type;
+
+
+    public static List<Map<String,String>> mapList = new ArrayList<>();
+
+    static{
+        for(CompanyTypeEnum companyTypeEnum:CompanyTypeEnum.values()){
+            Map<String,String> map = new HashMap();
+            map.put("name", companyTypeEnum.getType());
+            map.put("id", companyTypeEnum.getKey());
+            mapList.add(map);
+        }
+    }
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/constants/XJConstant.java

@@ -21,6 +21,9 @@ public class XJConstant {
     public static final String CHECK_TYPE = "CHECK_TYPE";
     public static final String DEPT_WF_MAP_DIC_CODE = "DEPT_WF_MAP";
 
+    /** 企业用户注册前缀 */
+    public static final String UGP_USER_TEL = "ugp_tel_";
+
     /**
      * 构造方法
      */

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java

@@ -3,14 +3,20 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sun.org.apache.xpath.internal.objects.XObject;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
+import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
@@ -19,6 +25,8 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -30,6 +38,8 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import java.util.*;
 
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.CompanyServiceImpl;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,6 +73,12 @@ public class CompanyController extends BaseController {
 	@Value("${amos.secret.key}")
 	String secretKey;
 
+	@Value("${ugp.sms.tempCode}")
+	private String smsTempCode;
+
+	@Autowired
+	RedisUtils redisUtils;
+
     /**
      * 新增企业信息表
      *
@@ -234,5 +250,140 @@ public class CompanyController extends BaseController {
 	public ResponseModel<OrgUsrDto> getInfo(@RequestBody JSONObject jsonObject, String bizOrgType,String sequenceNbr){
 		return ResponseHelper.buildResponse(orgServiceImpl.dataHandling(jsonObject,bizOrgType,sequenceNbr));
 	}
+	/**
+	 * 企业注册：获取单位类型
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/getType")
+	@ApiOperation(httpMethod = "Get", value = "", notes = "")
+	public ResponseModel<List> getType(){
+		return ResponseHelper.buildResponse(CompanyTypeEnum.mapList);
+	}
+
+//	/**
+//	 * 企业注册：3、账号信息提交
+//	 */
+//	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+//	@PostMapping(value = "/saveInfo")
+//	@ApiOperation(httpMethod = "POST", value = "", notes = "")
+//	public ResponseModel<String> saveInfo(Object object){
+//		return ResponseHelper.buildResponse(companyServiceImpl.saveInfo(object));
+//	}
+
+	/**
+	 * 获取组织机构树
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/region/tree")
+	@ApiOperation(httpMethod = "GET", value = "获取组织机构树", notes = "获取组织机构树")
+	public ResponseModel<Collection<RegionModel>> getRegionTree() {
+		return  ResponseHelper.buildResponse(Systemctl.regionClient.queryForTree(null).getResult());
+	}
+
+	/**
+	 * 判断用户是否存在
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/hasExistUser/{adminLoginName}")
+	@ApiOperation(httpMethod = "GET", value = "判断用户是否存在", notes = "判断用户是否存在")
+	public ResponseModel<Boolean> hasExistUser( @PathVariable(value = "adminLoginName") String adminLoginName) {
+		Boolean flag = false;
+		Company company = companyServiceImpl.getOne(new LambdaQueryWrapper<Company>().eq(Company::getAdminLoginName,adminLoginName));
+		if(!ValidationUtil.isEmpty(company)) {
+			flag = true;
+		}
+		return ResponseHelper.buildResponse(flag);
+	}
+
+	/**
+	 * 判断手机号是否已经注册
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/hasExistPhone/{adminTel}")
+	@ApiOperation(httpMethod = "GET", value = "判断手机号是否已经注册", notes = "判断手机号是否已经注册")
+	public ResponseModel<Boolean> hasExistPhone( @PathVariable(value = "adminTel") String adminTel) {
+		Boolean flag = false;
+		Company company = companyServiceImpl.getOne(new LambdaQueryWrapper<Company>().eq(Company::getAdminTel,adminTel));
+		if(!ValidationUtil.isEmpty(company)) {
+			flag = true;
+		}
+		return ResponseHelper.buildResponse(flag);
+	}
+
+	/**
+	 * 发送手机号验证码
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/sendTelCode/{tel}")
+	@ApiOperation(httpMethod = "GET", value = "发送手机号验证码", notes = "发送手机号验证码")
+	public ResponseModel<Boolean> sendTelCode( @PathVariable(value = "tel") String adminTel) {
+		if (ValidationUtil.isEmpty(adminTel)) {
+			throw new BadRequest("参数校验失败.");
+		}
+		Boolean flag = false;
+		HashMap<String, String> params = new HashMap<>();
+		String code = this.getRandomCode();
+		params.put("code",code);
+		params.put("mobile",adminTel);
+		params.put("smsCode", smsTempCode);
+		try {
+			Systemctl.smsClient.sendCommonSms(params).getResult();
+			flag = true;
+		} catch (Exception e) {
+			throw new BadRequest("发送短信失败：" + e.getMessage());
+		}
+		// code 保存到缓存中
+		redisUtils.set(XJConstant.UGP_USER_TEL + adminTel, code);
+		return ResponseHelper.buildResponse(flag);
+	}
+
+
+	private String getRandomCode(){
+		String code = "";
+		Random random = new Random();
+		for (int i = 0; i < 6; i++) {
+			int r = random.nextInt(10); //每次随机出一个数字（0-9）
+			code = code + r;  //把每次随机出的数字拼在一起
+		}
+		return code;
+
+	}
+
+	/**
+	 * 验证手机号验证码是否成功
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/verifyTelCode/{tel}/{code}")
+	@ApiOperation(httpMethod = "GET", value = "验证手机号验证码是否成功", notes = "验证手机号验证码是否成功")
+	public ResponseModel<Boolean> verifyTelCode(@PathVariable(value = "tel") String adminTel, @PathVariable(value = "code") String code) {
+		Boolean flag = false;
+		if (ValidationUtil.isEmpty(adminTel) || ValidationUtil.isEmpty(code)) {
+			throw new BadRequest("参数校验失败.");
+		}
+		if(redisUtils.hasKey(XJConstant.UGP_USER_TEL + adminTel)) {
+			String redisCode = redisUtils.get(XJConstant.UGP_USER_TEL + adminTel).toString();
+			if(code.equals(redisCode)) {
+				flag = true;
+			}
+		}
+		return ResponseHelper.buildResponse(flag);
+	}
+
+
+
+
+
+
+
 }
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.CompanyTypeEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.ICompanyService;
@@ -16,7 +19,9 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -30,8 +35,11 @@ import java.util.stream.Collectors;
  */
 @Service
 public class CompanyServiceImpl extends BaseService<CompanyDto, Company, CompanyMapper> implements ICompanyService {
+
     @Autowired
     CompanyMapper companyMapper;
+    @Autowired
+    ICompanyService iCompanyService;
 
     /**
      * 列表查询 示例
@@ -55,7 +63,26 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             page1.setRecords(collect);
         }
 
-
         return page1;
     }
+
+
+
+    /**
+     * 企业注册：3、账号信息提交
+     * @param object
+     * @return
+     */
+//
+//    public String saveInfo(Object object){
+//        JSONObject obj = JSONObject.parseObject(JSON.toJSONString(object));
+//        String name = obj.getString("name");
+//        String creditCode = obj.getString("creditCode");
+//        String createTime = obj.getString("createTime");
+//        String unitTel =
+//
+//        return null;
+//    }
+
+
 }
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/application.properties

@@ -33,6 +33,9 @@ params.work.flow.processDefinitionKey=xiangmulixiangliucheng
 params.work.flow.problemDefinitionKey=zhiliangwentiliucheng
 amos.secret.key=ugp
 
+
+ugp.sms.tempCode=SMS_UGP_0007
+
 #logging.level.com.yeejoin.amos=error
 
 #spring.security.user.name=admin