Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/LantoneProductWrapper.java

@@ -46,11 +46,6 @@ public class LantoneProductWrapper extends LantoneProduct {
      */
     private String organizationName;
 
-    /**
-     * 关联的service
-     */
-    private String serviceIds;
-
     /**
      * 关联的service
      */
@@ -64,14 +59,6 @@ public class LantoneProductWrapper extends LantoneProduct {
         this.serviceInfos = serviceInfos;
     }
 
-    public String getServiceIds() {
-        return serviceIds;
-    }
-
-    public void setServiceIds(String serviceIds) {
-        this.serviceIds = serviceIds;
-    }
-
     public String getOrganizationName() {
         return organizationName;
     }

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/ProductServiceWrapper.java

@@ -1,7 +1,6 @@
 package com.diagbot.entity.wrapper;
 
 import com.diagbot.entity.ProductService;
-import com.diagbot.entity.ServiceToken;
 
 /**
  * @Description:
@@ -9,10 +8,6 @@ import com.diagbot.entity.ServiceToken;
  * @time: 2018/9/19 16:06
  */
 public class ProductServiceWrapper extends ProductService {
-    /*private LantoneProduct lantoneProduct;
-    private OpenedProducts openedProducts;
-    private ServiceInfo serviceInfo;*/
-    private ServiceToken serviceToken;
     private Long userId;
 
     /**
@@ -75,12 +70,4 @@ public class ProductServiceWrapper extends ProductService {
     public void setServiceDescription(String serviceDescription) {
         this.serviceDescription = serviceDescription;
     }
-
-    public ServiceToken getServiceToken() {
-        return serviceToken;
-    }
-
-    public void setServiceToken(ServiceToken serviceToken) {
-        this.serviceToken = serviceToken;
-    }
 }

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/ServiceInfoWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import com.diagbot.entity.ServiceInfo;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/10/15 9:57
+ */
+public class ServiceInfoWrapper extends ServiceInfo {
+    /**
+     * 产品Id
+     */
+    private Long productId;
+
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+}

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/ServiceTokenWrapper.java

@@ -13,4 +13,9 @@ import lombok.Setter;
 @Setter
 public class ServiceTokenWrapper extends ServiceToken {
     private String url;
+
+    private String productName;
+
+    private String serviceName;
+
 }

diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.UserServiceClient;
@@ -13,20 +14,24 @@ import com.diagbot.entity.OpenedProductsIndex;
 import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
+import com.diagbot.entity.wrapper.ServiceInfoWrapper;
 import com.diagbot.enums.AccessTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ProductAuditEnum;
+import com.diagbot.enums.ServiceTypeEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.LantoneProductServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddProductsVO;
 import com.diagbot.vo.LantoneProductSelectVO;
 import com.diagbot.vo.OppendedProductVO;
 import com.diagbot.vo.UpdateProductVO;
+import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -127,6 +132,16 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "获取用户机构信息失败");
         }
+
+        List<ServiceInfoWrapper> serviceInfoWrapperList = serviceInfoFacade.selectWrapperListByUserId(userId);
+        Map<Long, List<ServiceInfoWrapper>> serviceListMap = EntityUtil.makeEntityListMap(serviceInfoWrapperList, "productId");
+
+        QueryWrapper<ServiceInfo> qwServiceInfo = new QueryWrapper();
+        qwServiceInfo.eq("user_id", userId).
+                eq("type", ServiceTypeEnum.User_Create.getKey()).
+                eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<ServiceInfo> serviceInfoList = serviceInfoFacade.list(qwServiceInfo);
+
         for (LantoneProductWrapper product : list) {
             product.setOrganizationName(mapRespDTO.data.get(userId).getOrgName());
             String[] accessType = product.getAccessType().split(",|，");
@@ -144,14 +159,19 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
             product.setAccessTypeArray(accessTypeArray);
             product.setChargeTypeArray(chargeTypeArray);
 
-            String[] serviceIds = product.getServiceIds().split(",|，");
-            Long[] lserviceIds = new Long[serviceIds.length];
-            for (int i = 0; i < serviceIds.length; i++) {
-                lserviceIds[i] = Long.parseLong(serviceIds[i]);
+            List<ServiceInfoWrapper> serviceWrappers = serviceListMap.get(product.getId());
+            Map<Long, ServiceInfoWrapper> serviceRelationMap = EntityUtil.makeEntityMap(serviceWrappers, "id");
+            if (serviceWrappers != null) {
+                List<ServiceInfo> serviceNoRelations = Lists.newArrayList();
+                for (ServiceInfo serviceInfo : serviceInfoList) {
+                    if (!serviceRelationMap.containsKey(serviceInfo.getId())) {
+                        serviceNoRelations.add(serviceInfo);
+                    }
+                }
+                product.setServiceInfos(serviceNoRelations);
+            } else {
+                product.setServiceInfos(serviceInfoList);
             }
-
-            List<ServiceInfo> services = serviceInfoFacade.getServiceListNoRelation(lserviceIds);
-            product.setServiceInfos(services);
         }
         return list;
     }

diagbotman-service/src/main/java/com/diagbot/facade/ProductServiceFacade.java

@@ -1,12 +1,10 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.ProductServiceDTO;
 import com.diagbot.entity.LantoneProduct;
-import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.ProductService;
 import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.ServiceToken;
@@ -18,7 +16,6 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ProductServiceServiceImpl;
 import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
 import com.diagbot.util.GuidUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ProductServiceSaveVO;
@@ -26,8 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:产品与用户端关联业务层
@@ -118,7 +113,6 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         serviceTokenFacade.save(serviceToken);
         productServiceDTO.setServiceToken(serviceToken);
 
-        //productServiceDTO.setProductService(productService);
         productServiceDTO.setProductId(productService.getProductId());
         productServiceDTO.setServiceId(productService.getServiceId());
 
@@ -133,26 +127,19 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
     /**
      * 删除产品服务端关联，级联删除令牌
      *
-     * @param productServiceSaveVO
+     * @param productServiceId
      * @return
      */
-    public Boolean deleteProductService(ProductServiceSaveVO productServiceSaveVO) {
-        QueryWrapper<ProductService> qwps = new QueryWrapper<>();
-        qwps.eq("product_id", productServiceSaveVO.getProductId());
-        qwps.eq("service_id", productServiceSaveVO.getServiceId());
-        qwps.eq("is_deleted", IsDeleteEnum.N.getKey());
-        ProductService productService = this.getOne(qwps);
-        if (productService == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "找不到产品服务端");
+    public Boolean deleteProductService(Long productServiceId) {
+        ProductService productService = this.getById(productServiceId);
+        if (productService == null || productService.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "找不到产品服务端");
         }
         //删除关联令牌
         serviceTokenFacade.deleteByProductServiceId(productService.getId());
         //删除产品服务端
-        UpdateWrapper<ProductService> uwps = new UpdateWrapper<>();
         productService.setIsDeleted(IsDeleteEnum.Y.getKey());
         this.updateById(productService);
-        //this.delById(productService.getId());
         return true;
     }
 
@@ -165,40 +152,9 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
      */
     public IPage<ProductServiceWrapper> selectProductServiceByCurrentUserPage(Page<ProductServiceWrapper> page) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        //当前登录用户服务端列表
-        /*QueryWrapper<ServiceInfo> qwService = new QueryWrapper<>();
-        qwService.eq("is_deleted", IsDeleteEnum.N.getKey());
-        qwService.eq("user_id", userId);
-        List<ServiceInfo> serviceInfoList = serviceInfoFacade.list(qwService);
-        Map<Long, ServiceInfo> serviceData = EntityUtil.makeEntityMap(serviceInfoList, "id");*/
-        //服务令牌列表
-        QueryWrapper<ServiceToken> qwToken = new QueryWrapper<>();
-        qwToken.eq("is_deleted", IsDeleteEnum.N.getKey());
-        List<ServiceToken> serviceTokenList = serviceTokenFacade.list(qwToken);
-        Map<Long, ServiceToken> tokenData = EntityUtil.makeEntityMap(serviceTokenList, "productServiceId");
-        //产品列表
-        /*QueryWrapper<LantoneProduct> qwProduct = new QueryWrapper<>();
-        qwProduct.eq("is_deleted", IsDeleteEnum.N.getKey());
-        List<LantoneProduct> lantoneProductList = lantoneProductFacade.list(qwProduct);
-        Map<Long, LantoneProduct> lantoneProductData = EntityUtil.makeEntityMap(lantoneProductList, "id");*/
-        //当前用户开通的产品列表
-       /* QueryWrapper<OpenedProducts> qwOpenedProducts = new QueryWrapper<>();
-        qwOpenedProducts.eq("is_deleted", IsDeleteEnum.N.getKey());
-        qwOpenedProducts.eq("user_id", userId);
-        List<OpenedProducts> openedProductsList = openedProductsFacade.list(qwOpenedProducts);
-        Map<Long, OpenedProducts> openedProductData = EntityUtil.makeEntityMap(openedProductsList, "productId");*/
-
         ProductServiceWrapper productServiceVO = new ProductServiceWrapper();
         productServiceVO.setUserId(userId);
         IPage<ProductServiceWrapper> psPage = this.selectProductServicePage(page, productServiceVO);
-        List<ProductServiceWrapper> psList = psPage.getRecords();
-        for (ProductServiceWrapper productService : psList) {
-            /*productService.setLantoneProduct(lantoneProductData.get(productService.getProductId()));
-            productService.setOpenedProducts(openedProductData.get(productService.getProductId()));
-            productService.setServiceInfo(serviceData.get(productService.getServiceId()));*/
-            productService.setServiceToken(tokenData.get(productService.getId()));
-        }
-        psPage.setRecords(psList);
         return psPage;
     }
 }

diagbotman-service/src/main/java/com/diagbot/facade/ServiceTokenFacade.java

@@ -3,16 +3,19 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.ProductService;
 import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.ServiceToken;
+import com.diagbot.entity.wrapper.ServiceTokenWrapper;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ServiceTokenServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ServiceTokenVo;
@@ -39,6 +42,8 @@ public class ServiceTokenFacade extends ServiceTokenServiceImpl {
     OpenedProductsFacade openedProductsFacade;
     @Autowired
     ServiceInfoFacade serviceInfoFacade;
+    @Autowired
+    LantoneProductFacade lantoneProductFacade;
 
 
     /**
@@ -105,6 +110,35 @@ public class ServiceTokenFacade extends ServiceTokenServiceImpl {
         return this.selectOneRecord(qw);
     }
 
+    /**
+     * 根据产品服务关联id获取令牌（包含产品和服务端信息）
+     *
+     * @param productServiceId
+     * @return
+     */
+    public ServiceTokenWrapper getWrapperByProductServiceId(Long productServiceId) {
+
+        checkCurrentUser(productServiceId);
+        QueryWrapper<ServiceToken> qw = new QueryWrapper<>();
+        qw.eq("product_service_id", productServiceId).
+                eq("type", TokenTypeEnum.Manual.getKey());
+        ServiceToken serviceToken = this.selectOneRecord(qw);
+        ServiceTokenWrapper serviceTokenWrapper = new ServiceTokenWrapper();
+        BeanUtil.copyProperties(serviceToken, serviceTokenWrapper);
+
+        ProductService productService = productServiceFacade.getById(productServiceId);
+        ServiceInfo serviceInfo = serviceInfoFacade.getById(productService.getServiceId());
+        LantoneProduct lantoneProduct = lantoneProductFacade.getById(productService.getProductId());
+        if (lantoneProduct == null || lantoneProduct.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "产品不存在");
+        }
+
+        serviceTokenWrapper.setServiceName(serviceInfo.getName());
+        serviceTokenWrapper.setProductName(lantoneProduct.getName());
+
+        return serviceTokenWrapper;
+    }
+
     /**
      * 根据产品服务关联id删除令牌
      *
@@ -162,11 +196,11 @@ public class ServiceTokenFacade extends ServiceTokenServiceImpl {
     public Boolean checkCurrentUser(Long productServiceId) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         ProductService productService = productServiceFacade.getById(productServiceId);
-        if (productService == null) {
+        if (productService == null || productService.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "产品服务端关联不存在");
         }
         ServiceInfo serviceInfo = serviceInfoFacade.getById(productService.getServiceId());
-        if (serviceInfo == null) {
+        if (serviceInfo == null || serviceInfo.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "服务端不存在");
         } else if (serviceInfo.getUserId() != userId) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "登录用户与令牌所属用户不一致");

diagbotman-service/src/main/java/com/diagbot/mapper/ServiceInfoMapper.java

@@ -2,7 +2,9 @@ package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.entity.ServiceInfo;
+import com.diagbot.entity.wrapper.ServiceInfoWrapper;
 
+import java.util.List;
 /**
  * <p>
  * 用户服务表 Mapper 接口
@@ -12,4 +14,11 @@ import com.diagbot.entity.ServiceInfo;
  * @since 2018-09-17
  */
 public interface ServiceInfoMapper extends BaseMapper<ServiceInfo> {
+
+    /**
+     * 根据用户id取服务端列表
+     * @param userId
+     * @return
+     */
+    List<ServiceInfoWrapper> selectWrapperListByUserId(Long userId);
 }

diagbotman-service/src/main/java/com/diagbot/service/ServiceInfoService.java

@@ -2,6 +2,9 @@ package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.entity.ServiceInfo;
+import com.diagbot.entity.wrapper.ServiceInfoWrapper;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,4 +15,10 @@ import com.diagbot.entity.ServiceInfo;
  * @since 2018-09-17
  */
 public interface ServiceInfoService extends IService<ServiceInfo> {
+    /**
+     * 根据用户id取服务端列表
+     * @param userId
+     * @return
+     */
+    List<ServiceInfoWrapper> selectWrapperListByUserId(Long userId);
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/OpenedProductsServiceImpl.java

@@ -9,7 +9,6 @@ import com.diagbot.entity.OpenedProductsIndex;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.mapper.OpenedProductsMapper;
 import com.diagbot.service.OpenedProductsService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -26,8 +25,6 @@ import java.util.Map;
 @Service
 public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper, OpenedProducts> implements OpenedProductsService {
 
-    @Autowired
-    OpenedProductsMapper openedProductsMapper;
 
     @Override
     public IPage<OpenedProducts> selectOpendInfoByUserId(Page<OpenedProducts> page, Long userId) {
@@ -46,31 +43,31 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
 
     @Override
     public List<OpenedProducts> getByAppkeyAndSecret(Map<String, Object> map) {
-        return openedProductsMapper.getByAppkeyAndSecret(map);
+        return baseMapper.getByAppkeyAndSecret(map);
     }
 
     @Override
     public List<UserAndProdutDTO> getInformationAvailableByUserId(OpenedProducts openedProducts) {
         // TODO Auto-generated method stub
-        return openedProductsMapper.getInformationAvailableByUserId(openedProducts);
+        return baseMapper.getInformationAvailableByUserId(openedProducts);
     }
 
     @Override
     public boolean startAndendByuserId(OpenedProducts openedProducts) {
         // TODO Auto-generated method stub
-        return openedProductsMapper.startAndendByuserId(openedProducts);
+        return baseMapper.startAndendByuserId(openedProducts);
     }
 
     @Override
     public boolean delInformationAvailable(OpenedProducts openedProducts) {
         // TODO Auto-generated method stub
-        return openedProductsMapper.delInformationAvailable(openedProducts);
+        return baseMapper.delInformationAvailable(openedProducts);
     }
 
     @Override
     public boolean modifyOpeningTime(OpenedProducts openedProducts) {
         // TODO Auto-generated method stub
-        return openedProductsMapper.modifyOpeningTime(openedProducts);
+        return baseMapper.modifyOpeningTime(openedProducts);
     }
 
     @Override
@@ -84,7 +81,7 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
     }
     @Override
     public List<UserAndProdutDTO> getInformationAvailableByUserIds(List<Long> userIds){
-    	return openedProductsMapper.getInformationAvailableByUserIds(userIds);
+    	return baseMapper.getInformationAvailableByUserIds(userIds);
     }
 
     @Override

diagbotman-service/src/main/java/com/diagbot/service/impl/ServiceFilterServiceImpl.java

@@ -5,7 +5,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ServiceFilter;
 import com.diagbot.mapper.ServiceFilterMapper;
 import com.diagbot.service.ServiceFilterService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -19,10 +18,6 @@ import java.util.List;
 @Service
 public class ServiceFilterServiceImpl extends ServiceImpl<ServiceFilterMapper, ServiceFilter> implements ServiceFilterService {
 
-    @Autowired
-    ServiceFilterMapper serviceFilterMapper;
-
-
     /**
      * 获取需要appkey和secret的服务信息
      *
@@ -30,13 +25,13 @@ public class ServiceFilterServiceImpl extends ServiceImpl<ServiceFilterMapper, S
      */
     @Override
     public RespDTO<List<ServiceFilter>> getAll() {
-        List<ServiceFilter> list = serviceFilterMapper.getAll();
+        List<ServiceFilter> list = baseMapper.getAll();
         return RespDTO.onSuc(list);
     }
 
 
     public RespDTO<List<String>> getPermissonUrl(String appkey, String secret) {
-        List<ServiceFilter> list = serviceFilterMapper.getAll();
+        List<ServiceFilter> list = baseMapper.getAll();
         List<String> service = new ArrayList<>();
         for (ServiceFilter bean : list) {
             service.add(bean.getName());

diagbotman-service/src/main/java/com/diagbot/service/impl/ServiceInfoServiceImpl.java

@@ -2,10 +2,13 @@ package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.ServiceInfo;
+import com.diagbot.entity.wrapper.ServiceInfoWrapper;
 import com.diagbot.mapper.ServiceInfoMapper;
 import com.diagbot.service.ServiceInfoService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户服务表 服务实现类
@@ -16,4 +19,12 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ServiceInfoServiceImpl extends ServiceImpl<ServiceInfoMapper, ServiceInfo> implements ServiceInfoService {
+    /**
+     * 根据用户id取服务端列表
+     * @param userId
+     * @return
+     */
+    public List<ServiceInfoWrapper> selectWrapperListByUserId(Long userId){
+        return baseMapper.selectWrapperListByUserId(userId);
+    }
 }

diagbotman-service/src/main/java/com/diagbot/web/ProductServiceController.java

@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -56,18 +57,16 @@ public class ProductServiceController {
     /**
      * 删除产品服务端
      *
-     * @param productServiceSaveVO
+     * @param productServiceId
      * @return
      */
     @ApiOperation(value = "删除产品服务端[by:zhaops]",
-            notes = "productId：产品Id，必填<br>" +
-                    "serviceId：服务Id，必填<br> " )
+            notes = "productServiceId：产品服务关联Id，必填<br>" )
     @PostMapping("/deleteProductService")
     @SysLogger("deleteProductService")
     @Transactional
-    public RespDTO<Boolean> deleteProductService(@RequestBody ProductServiceSaveVO productServiceSaveVO) {
-        productServiceSaveVO.setType(TokenTypeEnum.Manual.getKey());
-        Boolean isSuccess = productServiceFacade.deleteProductService(productServiceSaveVO);
+    public RespDTO<Boolean> deleteProductService(@RequestParam Long productServiceId) {
+        Boolean isSuccess = productServiceFacade.deleteProductService(productServiceId);
         return RespDTO.onSuc(isSuccess);
     }
 

diagbotman-service/src/main/java/com/diagbot/web/ServiceTokenController.java

@@ -4,6 +4,8 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.ProductServiceDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.ServiceToken;
+import com.diagbot.entity.wrapper.ServiceTokenWrapper;
 import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.facade.ProductServiceFacade;
 import com.diagbot.facade.ServiceTokenFacade;
@@ -67,6 +69,21 @@ public class ServiceTokenController {
         return RespDTO.onSuc(productServiceDTO);
     }
 
+    /**
+     * 根据产品服务关联id获取令牌
+     * @param productServiceId
+     * @return
+     */
+    @ApiOperation(value = "根据产品服务关联id获取令牌[by:zhaops]",
+            notes = "productServiceId：产品服务id，必填<br>")
+    @PostMapping("/getTokenByProductServiceId")
+    @SysLogger("getTokenByProductServiceId")
+    @Transactional
+    public RespDTO<ServiceTokenWrapper> getTokenByProductServiceId(@RequestParam Long productServiceId) {
+        ServiceTokenWrapper serviceTokenWrapper = serviceTokenFacade.getWrapperByProductServiceId(productServiceId);
+        return RespDTO.onSuc(serviceTokenWrapper);
+    }
+
     /**
      * 令牌禁用
      *

diagbotman-service/src/main/resources/mapper/LantoneProductMapper.xml

@@ -90,17 +90,9 @@
 
     <!--根据用户查询已开通产品-->
     <select id="opendedProductByUserId" resultMap="BaseResultWrapperMap" parameterType="java.lang.Long">
-        select a.*,b.start_time,b.end_time,b.service_status as opened_service_status,c.time,t.service_ids
-        from diag_lantone_product a,diag_opened_products b,diag_product_order c,diag_order_details d,
-        (SELECT product_id,GROUP_CONCAT(service_id) as service_ids
-            FROM diag_product_service t1,diag_service_info t2
-            WHERE t1.service_id = t2.id
-            AND t1.is_deleted = 'N'
-            AND t2.is_deleted = 'N'
-            AND t2.user_id = #{userId}
-            AND t2.type = 1
-            GROUP BY t1.product_id) t
-        where a.id=b.product_id and a.id=d.product_id and a.id=t.product_id
+        select a.*,b.start_time,b.end_time,b.service_status as opened_service_status,c.time
+        from diag_lantone_product a,diag_opened_products b,diag_product_order c,diag_order_details d
+        where a.id=b.product_id and a.id=d.product_id
 			  and c.num=d.order_num
               and d.audit_status=1
               and a.is_deleted='N' and b.is_deleted='N' and c.is_deleted='N' and d.is_deleted='N'

diagbotman-service/src/main/resources/mapper/ServiceInfoMapper.xml

@@ -16,4 +16,29 @@
         <result column="user_id" property="userId"/>
         <result column="type" property="type"/>
     </resultMap>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultWrapperMap" type="com.diagbot.entity.wrapper.ServiceInfoWrapper">
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="name" property="name"/>
+        <result column="description" property="description"/>
+        <result column="user_id" property="userId"/>
+        <result column="type" property="type"/>
+        <result column="product_id" property="productId"/>
+    </resultMap>
+
+    <!--根据用户查询已开通产品-->
+    <select id="selectWrapperListByUserId" resultMap="BaseResultWrapperMap" parameterType="java.lang.Long">
+        select a.*,b.product_id
+        from diag_service_info a,diag_product_service b
+        where a.id=b.service_id
+        and a.type=1
+        and a.user_id= #{userId}
+        and a.is_deleted='N' and b.is_deleted='N'
+    </select>
 </mapper>

eureka-server/src/main/java/com/diagbot/listener/InstanceRenewListener.java

@@ -1,22 +1,22 @@
-package com.diagbot.listener;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceRenewedEvent;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Description: 心跳检测服务监听
- * @author: gaodm
- * @time: 2018/8/21 15:41
- */
-@Configuration
-public class InstanceRenewListener implements ApplicationListener<EurekaInstanceRenewedEvent> {
-    private static final Logger logger = LoggerFactory.getLogger(InstanceRenewListener.class);
-
-    @Override
-    public void onApplicationEvent(EurekaInstanceRenewedEvent event) {
-        logger.info("心跳检测服务：{}", event.getInstanceInfo().getAppName());
-    }
-}
+//package com.diagbot.listener;
+//
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceRenewedEvent;
+//import org.springframework.context.ApplicationListener;
+//import org.springframework.context.annotation.Configuration;
+//
+///**
+// * @Description: 心跳检测服务监听
+// * @author: gaodm
+// * @time: 2018/8/21 15:41
+// */
+//@Configuration
+//public class InstanceRenewListener implements ApplicationListener<EurekaInstanceRenewedEvent> {
+//    private static final Logger logger = LoggerFactory.getLogger(InstanceRenewListener.class);
+//
+//    @Override
+//    public void onApplicationEvent(EurekaInstanceRenewedEvent event) {
+//        logger.info("心跳检测服务：{}", event.getInstanceInfo().getAppName());
+//    }
+//}

eureka-server/src/main/resources/logback-spring.xml

@@ -213,7 +213,7 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
@@ -221,6 +221,14 @@
         </encoder>
     </appender>
 
+    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.2.241:5044</destination>
+        <!-- encoder必须配置,有多种可选 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"appname":"eureka-server"}</customFields>
+        </encoder>
+    </appender>
+
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
@@ -242,7 +250,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>
 
@@ -255,7 +263,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHTEST"/>
         </root>
     </springProfile>
 

gateway-service/src/main/resources/logback-spring.xml

@@ -196,7 +196,7 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG" />
 
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
@@ -204,6 +204,14 @@
         </encoder>
     </appender>
 
+    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.2.241:5044</destination>
+        <!-- encoder必须配置,有多种可选 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
+            <customFields>{"appname":"gateway-service"}</customFields>
+        </encoder>
+    </appender>
+
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
@@ -225,7 +233,7 @@
             <appender-ref ref="DEBUG" />
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT" />
-            <appender-ref ref="LOGSTASH" />
+            <appender-ref ref="LOGSTASHDEV" />
         </root>
     </springProfile>
 
@@ -238,7 +246,7 @@
             <appender-ref ref="DEBUG" />
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT" />
-            <appender-ref ref="LOGSTASH" />
+            <appender-ref ref="LOGSTASHTEST" />
         </root>
     </springProfile>
 

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -48,6 +48,8 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.RegexValidateUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.AmendOrgVO;
+import com.diagbot.vo.AmendUserInfoVO;
 import com.diagbot.vo.BaseIdVO;
 import com.diagbot.vo.ImgVerVerVO;
 import com.diagbot.vo.OrganizationVO;
@@ -725,6 +727,8 @@ public class UserFacade extends UserServiceImpl {
         userMap.put("type", userInfoOrganizationsVO.getType());
         userMap.put("position", userInfoOrganizationsVO.getPosition());
         userMap.put("userId", userInfoOrganizationsVO.getUserId());
+        userMap.put("orgId", userInfoOrganizationsVO.getOrgId());
+        userMap.put("orgSubNum", userInfoOrganizationsVO.getOrgSubNum());
         boolean res = updateUserInfoAll(userMap);
         if (!res) {
             throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
@@ -788,7 +792,7 @@ public class UserFacade extends UserServiceImpl {
      * @param userAndOrganizationVO
      * @return 添加用户信息和机构信息管理员
      */
-    public RespDTO<UserAndOrganizationVO> addUserInfos(UserAndOrganizationVO userAndOrganizationVO) {
+    public RespDTO<Boolean> addUserInfos(UserAndOrganizationVO userAndOrganizationVO) {
         // TODO 先查找机构，获取机构id,再注册用户,返回用户id, 取到用户id和 机构id ,查询用户机构关联表，在进行绑定
         // User user = new User();
         // 验证用户是否存在
@@ -838,12 +842,12 @@ public class UserFacade extends UserServiceImpl {
             userOrganization.setOrganizationId(userAndOrganizationVO.getOrganizationid());// 机构id
             userOrganization.setUserId(userId);// 用户id
 
-            userOrganizationFacade.save(userOrganization);
+            res = userOrganizationFacade.save(userOrganization);
         } else {
             throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
         }
 
-        return RespDTO.onSuc(userAndOrganizationVO);
+        return RespDTO.onSuc(res);
     }
 
 
@@ -1235,6 +1239,38 @@ public class UserFacade extends UserServiceImpl {
 	        ex.exportExcelNew("用户信息详情", listName, listId, list,response);
 		
 	}
+
+    //超管修改用户信息
+	public RespDTO<Boolean> updateUserInfos(AmendUserInfoVO amendUserInfoVO) {
+		 Map<String, Object> amendUserInfo = new HashMap<String, Object>();
+		 amendUserInfo.put("modifier", UserUtils.getCurrentPrincipleID());
+		 amendUserInfo.put("gmtModified", DateUtil.now());
+		 amendUserInfo.put("email", amendUserInfoVO.getEmail());
+		 amendUserInfo.put("userId", amendUserInfoVO.getUserId());
+		 amendUserInfo.put("autPosition",amendUserInfoVO.getAutPosition());
+		 amendUserInfo.put("linKman",amendUserInfoVO.getLinKman());
+	        boolean res = updateUserInfo(amendUserInfo);
+	        if (!res) {
+	            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+	        }
+	        return RespDTO.onSuc(res);
+	}
+
+    //超管修改机构信息
+	public RespDTO<Boolean> updateOrganizations(AmendOrgVO amendOrgVO) {
+		 Map<String, Object> amendOrg = new HashMap<String, Object>();
+		 amendOrg.put("modifier", UserUtils.getCurrentPrincipleID());
+		 amendOrg.put("gmtModified", DateUtil.now());
+		 amendOrg.put("address", amendOrgVO.getOrgAddress());
+		 amendOrg.put("type", amendOrgVO.getOrgType());
+		 amendOrg.put("orgId", amendOrgVO.getOrgId());
+		 amendOrg.put("orgSubNum", amendOrgVO.getOrgSubNum());
+	        boolean res = updateOrganizations(amendOrg);
+	        if (!res) {
+	            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+	        }
+	        return RespDTO.onSuc(res);
+	}
     
     
 }

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -73,5 +73,9 @@ public interface UserMapper extends BaseMapper<User> {
     public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, @Param("userOrg")  CustomerDTO userInfo);
     
     public IPage<AuthenticationDTO> queryAuthentication(Page page, @Param("authen")  CustomerDTO userInfo);
+    
+    public boolean updateUserInfo (@Param("amendUserInfo") Map<String, Object> amendUserInfo);
+    
+    public boolean updateOrganizations (@Param("amendOrg") Map<String, Object> amendOrg);
 
 }

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -70,4 +70,7 @@ public interface UserService extends IService<User> {
     
     public IPage<AuthenticationDTO> queryAuthentication(Page page,  CustomerDTO userInfo);
 
+    public boolean updateUserInfo (Map<String, Object> amendUserInfo);
+    
+    public boolean updateOrganizations (Map<String, Object> amendOrg);
 }

user-service/src/main/java/com/diagbot/service/impl/MenuServiceImpl.java

@@ -6,7 +6,6 @@ import com.diagbot.entity.wrapper.MenuWrapper;
 import com.diagbot.mapper.MenuMapper;
 import com.diagbot.service.MenuService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,8 +19,6 @@ import java.util.List;
 @Slf4j
 public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
 
-    @Autowired
-    MenuMapper menuMapper;
 
     /**
      * 根据用户id获取菜单信息
@@ -31,7 +28,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
      */
     @Override
     public List<MenuWrapper> getByRole(Long userId) {
-        return menuMapper.getByRole(userId);
+        return baseMapper.getByRole(userId);
     }
 
 
@@ -43,6 +40,6 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
      */
     @Override
     public List<MenuWrapper> getSubMenuById(Long id) {
-        return menuMapper.getSubMenuById(id);
+        return baseMapper.getSubMenuById(id);
     }
 }

user-service/src/main/java/com/diagbot/service/impl/PermissionServiceImpl.java

@@ -5,7 +5,6 @@ import com.diagbot.entity.Permission;
 import com.diagbot.mapper.PermissionMapper;
 import com.diagbot.service.PermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -19,11 +18,8 @@ import java.util.List;
 @Slf4j
 public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements PermissionService {
 
-    @Autowired
-    PermissionMapper permissionMapper;
-
     @Override
     public List<Permission> getPermissionByUserId(Long userId) {
-        return permissionMapper.getByUserId(userId);
+        return baseMapper.getByUserId(userId);
     }
 }

user-service/src/main/java/com/diagbot/service/impl/UserOrganizationServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.UserOrganization;
 import com.diagbot.mapper.UserOrganizationMapper;
 import com.diagbot.service.UserOrganizationService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -18,8 +17,6 @@ import java.util.Map;
 @Service
 public class UserOrganizationServiceImpl extends ServiceImpl<UserOrganizationMapper, UserOrganization> implements UserOrganizationService {
 
-    @Autowired
-    UserOrganizationMapper userOrganizationMapper;
 
     /**
      * 根据参数获取机构信息
@@ -29,12 +26,12 @@ public class UserOrganizationServiceImpl extends ServiceImpl<UserOrganizationMap
      */
     @Override
     public List<UserOrganization> selectByMap(Map map) {
-        return userOrganizationMapper.selectByMap(map);
+        return baseMapper.selectByMap(map);
     }
 
     @Override
     public List<UserOrganization> getAgencyPersonnel(UserOrganization userORG) {
-        return userOrganizationMapper.getAgencyPersonnel(userORG);
+        return baseMapper.getAgencyPersonnel(userORG);
 
     }
 }

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -8,13 +8,11 @@ import com.diagbot.dto.CustomerDTO;
 import com.diagbot.dto.OrganizationDTO;
 import com.diagbot.dto.UserAllDTO;
 import com.diagbot.dto.UserInfoDTO;
-import com.diagbot.dto.UserInfoExportDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.dto.UserOrgizationProductDTO;
 import com.diagbot.entity.User;
 import com.diagbot.mapper.UserMapper;
 import com.diagbot.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -31,9 +29,6 @@ import java.util.Map;
 @Service
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
 
-    @Autowired
-    UserMapper userMapper;
-
     /**
      * 根据用户查找信息
      *
@@ -81,7 +76,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     @Override
     public List<User> getByIds(List<Long> ids) {
-        return userMapper.getByIds(ids);
+        return baseMapper.getByIds(ids);
     }
 
 
@@ -93,7 +88,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      */
     @Override
     public List<UserOrgDTO> getUserOrgByIds(List<Long> userIds) {
-        return userMapper.getUserOrgDTOByIds(userIds);
+        return baseMapper.getUserOrgDTOByIds(userIds);
     }
 
     @Override
@@ -133,6 +128,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 		
 		return baseMapper.queryAuthentication(page, userInfo);
 	}
+
+	@Override
+	public boolean updateUserInfo(Map<String, Object> amendUserInfo) {
+		// TODO Auto-generated method stub
+		return baseMapper.updateUserInfo(amendUserInfo);
+	}
+
+	@Override
+	public boolean updateOrganizations(Map<String, Object> amendOrg) {
+		// TODO Auto-generated method stub
+		return baseMapper.updateOrganizations(amendOrg);
+	}
 	
 
 

user-service/src/main/java/com/diagbot/vo/AmendOrgVO.java

@@ -0,0 +1,26 @@
+package com.diagbot.vo;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 修改机构信息
+ * @date 2018年10月15日 上午9:55:38
+ */
+@Getter
+@Setter
+public class AmendOrgVO {
+
+    @NotNull(message = "请输入机构id!")
+	 private Long orgId;//机构ID
+	 private Integer orgType;//机构属性
+	 private String orgAddress;//机构地址
+	 private Integer orgSubNum;//下属机构数量
+}

user-service/src/main/java/com/diagbot/vo/AmendUserInfoVO.java

@@ -0,0 +1,25 @@
+package com.diagbot.vo;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 修改超管信息
+ * @date 2018年10月15日 上午9:55:10
+ */
+@Getter
+@Setter
+public class AmendUserInfoVO {
+	
+	@NotNull(message = "请输入用户id!")
+	private Long userId;//用户ID
+    private String linKman;//联系人
+    private String email;// 邮箱
+    private String autPosition;//岗位信息
+}

user-service/src/main/java/com/diagbot/vo/UserAndOrganizationVO.java

@@ -31,7 +31,7 @@ public class UserAndOrganizationVO {
     /**
      * 用户名
      */
-    @Pattern(regexp = "^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\\d{8}$", message = "请输入手机号!")
+   // @Pattern(regexp = "^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\\d{8}$", message = "请输入手机号!")
     private String userName;
 
     /**

user-service/src/main/java/com/diagbot/vo/UserInfoOrganizationsVO.java

@@ -16,10 +16,12 @@ import java.io.Serializable;
 public class UserInfoOrganizationsVO implements Serializable {
 
     private String email;//邮箱
+    private String linKman;//联系人
     private String principal;//负责人
     private String address;//单位地址
     private Integer type;//机构属性
     private String position;//岗位部门
-    @NotNull(message = "请输入用户id!")
+    private Integer orgSubNum;//下属机构数量
     private Long userId;//用户id
+    private Long orgId;//机构id
 }

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 import java.util.List;
+import java.util.Map;
 
 import javax.validation.Valid;
 
@@ -8,6 +9,7 @@ import com.diagbot.vo.UserInfoPagVO;
 import com.diagbot.vo.UserOrganProductPageVO;
 import com.diagbot.vo.UsernameVO;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,6 +32,8 @@ import com.diagbot.facade.OrganizationFacade;
 import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.facade.UserFacade;
 import com.diagbot.facade.UserOrganizationFacade;
+import com.diagbot.vo.AmendOrgVO;
+import com.diagbot.vo.AmendUserInfoVO;
 import com.diagbot.vo.BaseIdVO;
 import com.diagbot.vo.OrganizationNameVO;
 import com.diagbot.vo.OrganizationVO;
@@ -78,6 +82,7 @@ public class UserInfoController {
     @PostMapping("/updateUserInfoAll")
     @SysLogger("updateUserInfoAll")
     @Transactional
+    @ApiIgnore
     public RespDTO<UserInfoOrganizationsVO> updateUserInfoAll(
             @Valid @RequestBody UserInfoOrganizationsVO userInfoOrganizationsVO) {
         return userFacade.updateUserInfoAlls(userInfoOrganizationsVO);
@@ -123,7 +128,7 @@ public class UserInfoController {
     @PostMapping("/addUserInfo")
     @SysLogger("addUserInfo")
     @Transactional
-    public RespDTO<UserAndOrganizationVO> addUserInfo(@Valid @RequestBody UserAndOrganizationVO userAndOrganizationVO) {
+    public RespDTO<Boolean> addUserInfo(@Valid @RequestBody UserAndOrganizationVO userAndOrganizationVO) {
 
         return userFacade.addUserInfos(userAndOrganizationVO);
     }
@@ -172,5 +177,21 @@ public class UserInfoController {
 		return userFacade.queryAuthentications(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName(),userAndOrgPageVO.getStartTime(),userAndOrgPageVO.getEndTime());
 	} 
     
+    @ApiOperation(value = "超管信息修改接口[by:wangfeng]", notes = "用户id必传")
+    @PostMapping("/updateUserInfo")
+    @SysLogger("updateUserInfo")
+    @Transactional
+    public RespDTO<Boolean> updateUserInfo (@RequestBody AmendUserInfoVO amendUserInfoVO){
+		return userFacade.updateUserInfos(amendUserInfoVO);
+    	
+    }
     
+    @ApiOperation(value = "机构信息修改接口[by:wangfeng]", notes = "机构id必传")
+    @PostMapping("/updateOrganizations")
+    @SysLogger("updateOrganizations")
+    @Transactional
+    public RespDTO<Boolean> updateOrganization (@RequestBody AmendOrgVO amendOrgVO){
+		return userFacade.updateOrganizations(amendOrgVO);
+    	
+    }
 }

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

@@ -413,4 +413,59 @@
         AND aut.status = 2
         ORDER BY u.gmt_create DESC
     </select>
+	<update id="updateUserInfo" parameterType="java.util.Map">
+	UPDATE
+	sys_user a
+	JOIN sys_user_authentication b ON a.id = b.user_id
+	<trim prefix="set" suffixOverrides=",">
+		<if test="amendUserInfo.linKman != null">
+			a.linkman = #{amendUserInfo.linKman},
+		</if>
+		<if test="amendUserInfo.email != null">
+			a.email = #{amendUserInfo.email},
+		</if>
+		<if test="amendUserInfo.autPosition != null">
+			b.position = #{amendUserInfo.autPosition},
+		</if>
+		<if test="amendUserInfo.gmtModified != null">
+			a.gmt_modified =#{amendUserInfo.gmtModified},
+		</if>
+		<if test="amendUserInfo.gmtModified != null">
+			b.gmt_modified = #{amendUserInfo.gmtModified},
+		</if>
+		<if test="amendUserInfo.modifier != null">
+			a.modifier = #{amendUserInfo.modifier},
+		</if>
+		<if test="amendUserInfo.modifier != null">
+			b.modifier = #{amendUserInfo.modifier}
+		</if>
+	</trim>
+	WHERE
+	a.is_deleted = "N"
+	AND b.is_deleted = "N"
+	AND a.id = #{amendUserInfo.userId}
+    </update>
+	<update id="updateOrganizations" parameterType="java.util.Map">
+		UPDATE sys_organization a
+		<trim prefix="set" suffixOverrides=",">
+			<if test="amendOrg.address != null">
+				a.address = #{amendOrg.address},
+			</if>
+			<if test="amendOrg.type != null">
+				a.type = #{amendOrg.type},
+			</if>
+			<if test="amendOrg.subMum != null">
+				a.sub_num = #{amendOrg.subMum},
+			</if>
+			<if test="amendOrg.gmtModified != null">
+				a.gmt_modified =#{amendOrg.gmtModified},
+			</if>
+			<if test="amendOrg.modifier != null">
+				a.modifier =#{amendOrg.modifier}
+			</if>
+		</trim>
+		WHERE
+		a.is_deleted = "N"
+		AND a.id = #{amendOrg.orgId}
+	</update>
 </mapper>