Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal

src/main/java/cn/timer/api/bean/qyzx/QyzxEntInfoM.java

@@ -52,7 +52,7 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
 	@ApiModelProperty(value="法人 ",example="刘德华")
     private String operName;
     
-	@ApiModelProperty(value="企业规模  10人以下、10-19人、20-99人、100-500人、500人以上",example="3")
+	@ApiModelProperty(value="企业规模  0:10人以下、1:10-19人、2:20-99人、3:100-500人、4:500人以上",example="3")
     private Integer size;
     
 	@ApiModelProperty(value="电话号码 ",example="18712345678")
@@ -73,7 +73,7 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
 	@ApiModelProperty(value="行业类型  1:农、林、牧、渔业、2:采矿业、3:制造业、4:电力、燃气及水的生产和供应业、5:建筑业、6:交通运输、仓储和邮政业、7:信息传输、计算机服务和软件业、8:批发和零售业、9:住宿和餐饮业、10:金融业、11:房地产业、12:租赁和商务服务业、13:科学研究、技术服务和地质勘查业、14:水利、环境和公共设施管理业、15:居民服务和其他服务业",example="101")
     private Integer industryType;
     
-	@ApiModelProperty(value="开通渠道  1直属、2总代理、3独家代理、4一般代理商、5区域代理商",example="101")
+	@ApiModelProperty(value="开通渠道  1直属、2总代理、3独家代理、4一般代理商、5区域代理商 ",example="101")
     private Integer openChannel;
     
 	@ApiModelProperty(value="联系人",example="刘德华")
@@ -101,6 +101,9 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
 	@ApiModelProperty(value="认证时间 ",example="2019-12-12 08:00:00")
     private Date attestTime;
 	
+	@ApiModelProperty(value="认证通过时间 ",example="2019-12-12 08:00:00")
+    private Date attestPassTime;
+	
 	@ApiModelProperty(value="到期时间 ",example="2039-12-12 08:00:00")
 	private Date endTime;
 	

src/main/java/cn/timer/api/bean/qyzx/auth/QyzxAuthAccount.java

+/**  
+* <p>Title: QyzxAuthAccount.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年5月19日  
+* @version 1.0  
+*/  
+package cn.timer.api.bean.qyzx.auth;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**  
+* <p>Title: QyzxAuthAccount.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年5月19日  
+* @version 1.0  
+*/
+
+@Entity
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Table(name="qyzx_auth_account")
+@ApiModel("权限账号表")
+public class QyzxAuthAccount extends Model<QyzxAuthAccount>{
+	
+	private static final long serialVersionUID = -7906463769401403202L;
+	
+	@Id
+    @GeneratedValue
+    @TableId (type = IdType.AUTO)
+	@ApiModelProperty(value="主键",example="1")
+    private Integer id;
+	
+	@ApiModelProperty(value="员工id",example="9688")
+    private Integer empNum;
+	
+	@ApiModelProperty(value="企业id",example="117")
+    private Integer orgCode;
+	
+	@ApiModelProperty(value="头像url",example="ossUrl")
+    private String headUrl;
+	
+	@ApiModelProperty(value="姓名",example="tz")
+    private String name;
+	
+	@ApiModelProperty(value="主账号手机",example="18711519125")
+    private String accountPhone;
+	
+	@ApiModelProperty(value="创建时间",example="2020-05-20")
+    private Date createdTime;
+	
+}

src/main/java/cn/timer/api/controller/LoginController.java

@@ -3,9 +3,7 @@ package cn.timer.api.controller;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -14,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -406,21 +403,18 @@ public class LoginController {
 			qyzxEmpLogin1.setPw(Md5.md5("123456"));// 密码初始化
 
 			qyzxEmpLogin1.updateById();
-			
-			//员工信息 手机号修改
-			YgglMainEmp.builder().phone(phone).build().update(new UpdateWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, qyzxEmpLogin1.getId()));
+
+			// 员工信息 手机号修改
+			YgglMainEmp.builder().phone(phone).build().update(
+					new UpdateWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, qyzxEmpLogin1.getId()));
 			return ResultUtil.success("修改手机号/用户名成功");
 		}
-		
-		
-		
-		
+
 		return ResultUtil.error("修改手机号/用户名失败");
 	}
-	
+
 	@Autowired
 	SpmkServiceImpl SpmkService;
-	
 
 	/**
 	 * 注册企业
@@ -464,7 +458,7 @@ public class LoginController {
 			}
 
 			// 企业信息
-			QyzxEntInfoM qyzxEntInfoM = QyzxEntInfoM.builder().name(name).registerTime(DateUtil.date())
+			QyzxEntInfoM qyzxEntInfoM = QyzxEntInfoM.builder().name(name).registerTime(DateUtil.date()).phone(phone).operName(username)
 					.endTime(DateUtil.offsetDay(new Date(), offset)).level(CommonEnum.LEVEL_PROBATION.getType())
 					.build();
 			boolean b1 = qyzxEntInfoM.insert();
@@ -506,9 +500,9 @@ public class LoginController {
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				return ResultUtil.error("注册企业失败4");
 			}
-			
+
 			SpmkService.createCustomApproval(qyzxEntInfoM.getId());
-			
+
 			return ResultUtil.success("注册企业成功");
 		} catch (Exception e) {
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -635,7 +629,7 @@ public class LoginController {
 		if (qyzxEmpLogin1 != null) {
 			if (StrUtil.hasBlank(pw) || !qyzxEmpLogin1.getPw().equals(Md5.md5(pw)))
 				return ResultUtil.error("帐号密码错误");
-			
+
 			return loginhan(qyzxEmpLogin1, request);
 		} else {
 			return ResultUtil.error("帐号不存在-错误");

src/main/java/cn/timer/api/controller/qyzx/QyzxAuthController.java

+/**  
+* <p>Title: QyzxAuthController.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年5月19日  
+* @version 1.0  
+*/  
+package cn.timer.api.controller.qyzx;
+
+import java.util.List;
+
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import cn.timer.api.bean.qyzx.businessService.QyzxRemainingQuantity;
+import cn.timer.api.config.annotation.CurrentUser;
+import cn.timer.api.config.annotation.UserBean;
+import cn.timer.api.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**  
+* <p>Title: QyzxAuthController.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年5月19日  
+* @version 1.0  
+*/
+@Transactional
+@RestController
+@Api(tags = "4.2企业中心(账号权限)")
+@RequestMapping(value = "/qyzxAuth", produces = { "application/json" })
+public class QyzxAuthController {
+	
+	@GetMapping(value = "/getAll")
+	@ApiOperation(value = "获取全部账号信息", httpMethod = "GET", notes = "接口发布说明")
+	public Result<Void> getAll(@CurrentUser UserBean userBean) {
+		
+		
+		
+		return null;
+		
+	}
+	
+	
+}

src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java

@@ -14,8 +14,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.transaction.Transactional;
-
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -72,7 +71,7 @@ public class QyzxBusinessController {
 
 	@GetMapping(value = "/getAllQuantity")
 	@ApiOperation(value = "获取全部套餐余量信息", httpMethod = "GET", notes = "接口发布说明")
-	public Result<List<QyzxRemainingQuantity>> s(@CurrentUser UserBean userBean) {
+	public Result<List<QyzxRemainingQuantity>> getAllQuantity(@CurrentUser UserBean userBean) {
 		List<QyzxRemainingQuantity> list = QyzxRemainingQuantity.builder().build()
 				.selectList(new LambdaQueryWrapper<QyzxRemainingQuantity>().eq(QyzxRemainingQuantity::getIsDelete, 0)
 						.eq(QyzxRemainingQuantity::getOrgCode, userBean.getOrgCode()));

src/main/java/cn/timer/api/controller/zzgl/ZzglController.java

 package cn.timer.api.controller.zzgl;
 
-import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import javax.transaction.Transactional;
 
@@ -27,11 +22,7 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
-import cn.hutool.core.bean.copier.ValueProvider;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNode;
@@ -114,14 +105,14 @@ public class ZzglController {
 //		treeNodeConfig.setDeep(10);
 
 		//转换器
-		List<Tree<String>> treeNodes = TreeUtil.build(nodeList, "0", treeNodeConfig,
+		List<Tree<String>> treeNodes = TreeUtil.build(zzglBmgwMs, "0", treeNodeConfig,
 		        (treeNode, tree) -> {
-		            tree.setId(treeNode.getId());
-		            tree.setParentId(treeNode.getParentId());
-		            tree.setWeight(treeNode.getWeight());
+		            tree.setId(Convert.toStr(treeNode.getId()));
+		            tree.setParentId(Convert.toStr(treeNode.getUpId()));
+//		            tree.setWeight(treeNode.getWeight());
 		            tree.setName(treeNode.getName());
 		            // 扩展属性 ...
-//		            tree.putExtra("extraField", 666);
+		            tree.putExtra("leader", treeNode.getLeader());
 //		            tree.putExtra("other", new Object());
 		        });