Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/PrivilegeFeginService.java

+package com.yeejoin.amos.boot.module.jg.flc.api.fegin;
+
+
+import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.VerifyCodeAuthModel;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+@FeignClient(value = "AMOS-API-PRIVILEGE", configuration = {FeignConfiguration.class})
+public interface PrivilegeFeginService {
+
+    @RequestMapping(value = "/privilege/v1/agencyuser/me", method = RequestMethod.GET)
+    ResponseModel<AgencyUserModel> getMe();
+
+    //获取单位树
+    @RequestMapping(value = "/privilege/v1/company/tree", method = RequestMethod.GET)
+    FeignClientResult tree(@RequestHeader("token") String token, @RequestHeader("appKey") String appKey, @RequestHeader("product") String product);
+
+    //获取省级行政区划
+    @RequestMapping(value = "systemctl/v1/region/level", method = RequestMethod.GET)
+    FeignClientResult getProvince(@RequestParam String level);
+
+    //获取行政区划树
+    @RequestMapping(value = "systemctl/v1/region/tree", method = RequestMethod.GET)
+    FeignClientResult getTree();
+
+    /**
+     * 手机号验证码登录
+     */
+    @RequestMapping(value = "/privilege/v1/auth/mobile/verifycode", method = RequestMethod.POST)
+    FeignClientResult mobileVerifyCode(@RequestBody VerifyCodeAuthModel model) throws InnerInvokException;
+
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/EquipmentCategoryServiceImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.biz.service.IEquipmentCategoryService;
+import com.yeejoin.amos.boot.module.jg.flc.api.fegin.PrivilegeFeginService;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.api.mapper.EquipmentCategoryMapper;
@@ -55,8 +55,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     @Value("${regulator.unit.code}")
     private String code;
 
-/*    @Autowired
-    PrivilegeFeginService privilegeFeginService;*/
+    @Autowired
+    PrivilegeFeginService privilegeFeginService;
 
     @Override
     public List<EquipmentCategory> getEquipmentCategoryList(String code, String type) {
@@ -100,7 +100,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
 
 
     public List<LinkedHashMap> getProvinceList(String level) {
-        /*FeignClientResult result = privilegeFeginService.getProvince(level);
+        FeignClientResult result = privilegeFeginService.getProvince(level);
         List<LinkedHashMap> list = (List<LinkedHashMap>) result.getResult();
         for (LinkedHashMap linkedHashMap : list) {
             linkedHashMap.put("sequenceNbr", linkedHashMap.get("regionCode"));
@@ -122,8 +122,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                 log.error("不支持的行政区划：{}", level);
                 break;
         }
-        return list;*/
-        return null;
+        return list;
     }
 
 
@@ -136,14 +135,13 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
 
     @Override
     public List<LinkedHashMap> creatTree() {
-        return null;
-        //FeignClientResult tree = privilegeFeginService.tree(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
-        //List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
-        //List<LinkedHashMap> treeData = deleteRegulatorTreeData(result);
-        //List<LinkedHashMap> supervisionTree = treeData.stream().filter(e -> code.equals(e.get("orgCode"))).collect(Collectors.toList());
-        //List<LinkedHashMap> resultTree = updateNullChildren(supervisionTree);
-        //redisUtils.set(REGULATOR_UNIT_TREE, resultTree);
-        //return resultTree;
+        FeignClientResult tree = privilegeFeginService.tree(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
+        List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
+        List<LinkedHashMap> treeData = deleteRegulatorTreeData(result);
+        List<LinkedHashMap> supervisionTree = treeData.stream().filter(e -> code.equals(e.get("orgCode"))).collect(Collectors.toList());
+        List<LinkedHashMap> resultTree = updateNullChildren(supervisionTree);
+        redisUtils.set(REGULATOR_UNIT_TREE, resultTree);
+        return resultTree;
     }
 
     @Override

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzBaseUnitLicenceDto.java

@@ -19,7 +19,6 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("tz_base_unit_licence")
 @ApiModel(value="TzBaseUnitLicence对象", description="单位许可信息表")
 public class TzBaseUnitLicenceDto extends BaseDto {
 
@@ -40,7 +39,7 @@ public class TzBaseUnitLicenceDto extends BaseDto {
     @ApiModelProperty(value = "证书类型code")
     private String certTypeCode;
 
-    @ApiModelProperty(value = "证书编号")
+    @ApiModelProperty(value = "证书编号（核准证编号）")
     private String certNo;
 
     @ApiModelProperty(value = "有效期至")
@@ -73,10 +72,10 @@ public class TzBaseUnitLicenceDto extends BaseDto {
     @ApiModelProperty(value = "备注")
     private String remark;
 
-    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码")
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码（核准项目代码）")
     private String itemCode;
 
-    @ApiModelProperty(value = "许可项目/检验类型/设备品种")
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种（核准项目名称）")
     private String itemCodeName;
 
     @ApiModelProperty(value = "许可子项目/检验项目/充装介质类别code")
@@ -94,5 +93,14 @@ public class TzBaseUnitLicenceDto extends BaseDto {
     @ApiModelProperty(value = "固定检验地址")
     private String itemAddress;
 
+    @ApiModelProperty(value = "机构类别枚举")
+    private String agencyType;
+
+    @ApiModelProperty(value = "机构类别枚举名称，冗余")
+    private String agencyTypeCode;
+
+    @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
+    private String licenceType;
+
 
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseUnitLicence.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.elasticsearch.common.recycler.Recycler;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
@@ -38,7 +39,7 @@ public class TzBaseUnitLicence extends BaseEntity {
     @ApiModelProperty(value = "证书类型code")
     private String certTypeCode;
 
-    @ApiModelProperty(value = "证书编号")
+    @ApiModelProperty(value = "证书编号(核准证编号)")
     private String certNo;
 
     @ApiModelProperty(value = "有效期至")
@@ -71,10 +72,10 @@ public class TzBaseUnitLicence extends BaseEntity {
     @ApiModelProperty(value = "备注")
     private String remark;
 
-    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码")
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码（核准项目代码）")
     private String itemCode;
 
-    @ApiModelProperty(value = "许可项目/检验类型/设备品种")
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种（核准项目名称）")
     private String itemCodeName;
 
     @ApiModelProperty(value = "许可子项目/检验项目/充装介质类别code")
@@ -92,13 +93,20 @@ public class TzBaseUnitLicence extends BaseEntity {
     @ApiModelProperty(value = "固定检验地址")
     private String itemAddress;
 
-
     @ApiModelProperty(value = "更新人名称")
     private String recUserName;
 
-
     @ApiModelProperty(value = "是否删除（0：未删除，1：已删除）")
     private Boolean isDelete;
 
+    @ApiModelProperty(value = "机构类别枚举")
+    private String agencyType;
+
+    @ApiModelProperty(value = "机构类别枚举名称，冗余")
+    private String agencyTypeCode;
+
+    @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
+    private String licenceType;
+
 
 }